From bfe3c134703823109526f5d28299eee06662e66e Mon Sep 17 00:00:00 2001
From: Adrian Dvergsdal <github.com@konto.atmoz.no>
Date: Mon, 26 Sep 2016 20:13:53 +0200
Subject: [PATCH] --no-cache build option by default

---
 tests/id_rsa.pub |  2 +-
 tests/run        | 15 +++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/tests/id_rsa.pub b/tests/id_rsa.pub
index 669bbca..1363fbd 100644
--- a/tests/id_rsa.pub
+++ b/tests/id_rsa.pub
@@ -1 +1 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDHDDQw9a9miGWDEXLG9mMR7OuV3ufmkgm5htntuZnxRw1sUfySmgeaY5ZDvHw5uEMulxYS/yJ+hLxFgsj3tUwIlwRz9yRyrzZm+gBE4Xhsb+NhdaMQdFnMSn3cUw8UHO8FmRd4FLiSx32x+pF83JnNR67+3fzSg2wKmvz5OdoQSELn4TpRuOt4fQI+22QPRpGOuzN6vWGQazY/LzRVlKeJ1kasVE1p/GKCNwtE2nhkk3B4VzuZy4sh8Fqklcgka6PZcDGu3zqkFCgRJ9oRODSbcNaXhnXDrBlnbpaciJU4d2JdyPdTS11nAKLE+KEfnJhjLLp8TXWQzD2xB2HH7gEd atmoz@arch-book
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDHDDQw9a9miGWDEXLG9mMR7OuV3ufmkgm5htntuZnxRw1sUfySmgeaY5ZDvHw5uEMulxYS/yJ+hLxFgsj3tUwIlwRz9yRyrzZm+gBE4Xhsb+NhdaMQdFnMSn3cUw8UHO8FmRd4FLiSx32x+pF83JnNR67+3fzSg2wKmvz5OdoQSELn4TpRuOt4fQI+22QPRpGOuzN6vWGQazY/LzRVlKeJ1kasVE1p/GKCNwtE2nhkk3B4VzuZy4sh8Fqklcgka6PZcDGu3zqkFCgRJ9oRODSbcNaXhnXDrBlnbpaciJU4d2JdyPdTS11nAKLE+KEfnJhjLLp8TXWQzD2xB2HH7gEd test
diff --git a/tests/run b/tests/run
index 888299a..956d511 100755
--- a/tests/run
+++ b/tests/run
@@ -19,15 +19,19 @@ else
     redirect="/dev/stdout"
 fi
 
+buildOptions="--tag $sftpImageName"
+
 ##############################################################################
 
 function beforeTest() {
     if [ "$build" == "build" ]; then
-        docker build --pull=true --tag "$sftpImageName" "$buildDir"
-        if [ $? -gt 0 ]; then
-            echo "Build failed"
-            exit 1
-        fi
+        buildOptions="$buildOptions --no-cache --pull=true"
+    fi
+
+    docker build $buildOptions "$buildDir"
+    if [ $? -gt 0 ]; then
+        echo "Build failed"
+        exit 1
     fi
 
     # Private key can not be read by others
@@ -81,7 +85,6 @@ function runSftpCommands() {
         -b - $user@$ip \
         > "$redirect" 2>&1
 
-    sleep 1 # wait for command to finish
 }
 
 ##############################################################################