Archive-Team
/
docker-mailserver
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix setup_file marker logic

This commit is contained in:
Martin Schulze 2019-09-12 00:37:34 +02:00
parent a20f2c4199
commit 3f9dd4180a
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/test_helper/common.bash
View File

@ -34,13 +34,16 @@ function wait_for_finished_setup_in_container() {
repeat_until_success_or_timeout $TEST_TIMEOUT_IN_SECONDS sh -c "docker logs $1 | grep 'is up and running'" repeat_until_success_or_timeout $TEST_TIMEOUT_IN_SECONDS sh -c "docker logs $1 | grep 'is up and running'"
} }
SETUP_FILE_MARKER="$BATS_TMPDIR/`basename \"$BATS_TEST_FILENAME\".setup_file`" 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 # use in setup() in conjunction with a `@test "first" {}` to trigger setup_file reliably
function run_setup_file_if_necessary() { function run_setup_file_if_necessary() {
if [ "$BATS_TEST_NAME" == 'test_first' ]; then if [ "$BATS_TEST_NAME" == 'test_first' ]; then
rm -f "$SETUP_FILE_MARKE" # prevent old markers from marking success or get an error if we cannot remove due to permissions
rm -f "$SETUP_FILE_MARKER"
setup_file setup_file
touch "$SETUP_FILE_MARKER" touch "$SETUP_FILE_MARKER"
else else
if [ ! -f "$SETUP_FILE_MARKER" ]; then if [ ! -f "$SETUP_FILE_MARKER" ]; then
@ -53,7 +56,8 @@ function run_setup_file_if_necessary() {
# use in teardown() in conjunction with a `@test "last" {}` to trigger teardown_file reliably # use in teardown() in conjunction with a `@test "last" {}` to trigger teardown_file reliably
function run_teardown_file_if_necessary() { function run_teardown_file_if_necessary() {
if [ "$BATS_TEST_NAME" == 'test_last' ]; then if [ "$BATS_TEST_NAME" == 'test_last' ]; then
rm -f "$SETUP_FILE_MARKE" # cleanup setup file marker
rm -f "$SETUP_FILE_MARKER"
teardown_file teardown_file
fi fi
} }