From efb7d3e5ab624d7b2a91aa2e61986ca2b2478841 Mon Sep 17 00:00:00 2001
From: ViViDboarder <ViViDboarder@gmail.com>
Date: Mon, 29 Jan 2018 12:29:33 -0800
Subject: [PATCH] Add test for existance of cron and crontab

This was missing in x86 builds and we don't have a test verifying the
crontabs themselves, so it was never caught. It would be better to
verify those, but that would mean async testing which could result in
very slow builds or other issues.

Fixes #5
---
 Dockerfile.raspbian | 8 ++++++--
 Dockerfile.ubuntu   | 8 ++++++--
 itest.sh            | 4 ++++
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/Dockerfile.raspbian b/Dockerfile.raspbian
index bc21504..1d4e0d6 100644
--- a/Dockerfile.raspbian
+++ b/Dockerfile.raspbian
@@ -5,17 +5,21 @@ RUN [ "cross-build-start" ]
 
 RUN apt-get update \
         && apt-get install -y --no-install-recommends \
-            duplicity python-setuptools cron python-pexpect openssh-client \
+            cron \
+            duplicity \
             lftp \
             ncftp \
+            openssh-client \
             python-cloudfiles \
             python-gdata \
             python-oauthlib \
             python-paramiko \
+            python-pexpect \
+            python-pip \
+            python-setuptools \
             python-urllib3 \
             rsync \
             tahoe-lafs \
-            python-pip \
         && pip install -U boto  \
         && apt-get remove -y python-pip \
         && apt-get install -y --no-install-recommends \
diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu
index 6b1b2f8..b9bd5bd 100644
--- a/Dockerfile.ubuntu
+++ b/Dockerfile.ubuntu
@@ -7,18 +7,22 @@ RUN apt-get update \
         && add-apt-repository ppa:duplicity-team/ppa \
         && apt-get update \
         && apt-get install -y --no-install-recommends \
-            duplicity python-setuptools python-pexpect openssh-client \
+            cron \
+            duplicity \
             lftp \
             ncftp \
+            openssh-client \
             python-cloudfiles \
             python-gdata \
             python-oauthlib \
             python-paramiko \
+            python-pexpect \
+            python-pip \
+            python-setuptools \
             python-swiftclient \
             python-urllib3 \
             rsync \
             tahoe-lafs \
-            python-pip \
         && pip install -U boto  \
         && apt-get autoremove -y python-pip \
         && apt-get clean \
diff --git a/itest.sh b/itest.sh
index dadc055..f9b5303 100755
--- a/itest.sh
+++ b/itest.sh
@@ -3,6 +3,10 @@ set -e
 
 echo "Performing backup tests"
 
+echo "Verify cron and crontab exist"
+type cron
+type crontab
+
 echo "Create test data..."
 mkdir -p /data && echo Test > /data/test.txt