From 8e6152ff2f4d40b78faf5404bdc5c450ddedf1c9 Mon Sep 17 00:00:00 2001
From: Martin Schulze <martin.schulze@vireso.de>
Date: Wed, 11 Sep 2019 00:02:16 +0200
Subject: [PATCH 1/2] Fix missing error output from timeout

The exits would prevent the printing code from running
---
 test/test_helper/common.bash | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/test_helper/common.bash b/test/test_helper/common.bash
index c8580b3e..b028cbf3 100644
--- a/test/test_helper/common.bash
+++ b/test/test_helper/common.bash
@@ -9,7 +9,7 @@ TEST_TIMEOUT_IN_SECONDS=${TEST_TIMEOUT_IN_SECONDS-60}
 function repeat_until_success_or_timeout {
     if ! [[ "$1" =~ ^[0-9]+$ ]]; then
         echo "First parameter for timeout must be an integer, recieved \"$1\""
-        exit 1
+        return 1
     fi
     TIMEOUT=$1
     STARTTIME=$SECONDS
@@ -19,7 +19,7 @@ function repeat_until_success_or_timeout {
         sleep 5
         if [[ $(($SECONDS - $STARTTIME )) -gt $TIMEOUT ]]; then
             echo "Timed out on command: $@"
-            exit 1
+            return 1
         fi
     done
 }

From 3513944d0a66b13ab4a3779cf4caea4ef935e53f Mon Sep 17 00:00:00 2001
From: Martin Schulze <martin.schulze@vireso.de>
Date: Wed, 11 Sep 2019 01:01:51 +0200
Subject: [PATCH 2/2] Skip all tests of file after failed setup_file

---
 test/test_helper/common.bash | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/test/test_helper/common.bash b/test/test_helper/common.bash
index b028cbf3..b1052119 100644
--- a/test/test_helper/common.bash
+++ b/test/test_helper/common.bash
@@ -34,16 +34,26 @@ function wait_for_finished_setup_in_container() {
     repeat_until_success_or_timeout $TEST_TIMEOUT_IN_SECONDS sh -c "docker logs $1 | grep 'Starting mail server'"
 }
 
+SETUP_FILE_MARKER="$BATS_TMPDIR/`basename \"$BATS_TEST_FILENAME\".setup_file`"
+
 # use in setup() in conjunction with a `@test "first" {}` to trigger setup_file reliably
 function run_setup_file_if_necessary() {
     if [ "$BATS_TEST_NAME" == 'test_first' ]; then
+        rm -f "$SETUP_FILE_MARKE"
         setup_file
+        touch "$SETUP_FILE_MARKER"
+    else
+        if [ ! -f "$SETUP_FILE_MARKER" ]; then
+            skip "setup_file failed"
+            return 1
+        fi
     fi
 }
 
 # use in teardown() in conjunction with a `@test "last" {}` to trigger teardown_file reliably
 function run_teardown_file_if_necessary() {
     if [ "$BATS_TEST_NAME" == 'test_last' ]; then
+        rm -f "$SETUP_FILE_MARKE"
         teardown_file
     fi
 }
\ No newline at end of file