github-com-docker-mailserver/docker-mailserver
1
0
Fork 0
mirror of https://github.com/docker-mailserver/docker-mailserver.git synced 2024-01-19 02:48:50 +00:00
Code Issues Projects Releases Wiki Activity

Fix shellcheck issues

Browse source
This commit is contained in:
Martin Schulze 2020-10-01 14:56:19 +02:00
parent 0d4eb08de8
commit 53b930448d
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
test/test_helper/common.bash
View file

@ -30,8 +30,8 @@ function repeat_until_success_or_timeout {
exit 1 exit 1
fi fi
sleep 5 sleep 5
if [[ $(($SECONDS - $STARTTIME )) -gt $TIMEOUT ]]; then if [[ $(( SECONDS - STARTTIME )) -gt $TIMEOUT ]]; then
echo "Timed out on command: $@" >&2 echo "Timed out on command: $*" >&2
return 1 return 1
fi fi
done done
@ -51,8 +51,8 @@ function run_until_success_or_timeout {
until run "$@" && [[ $status -eq 0 ]] until run "$@" && [[ $status -eq 0 ]]
do do
sleep 1 sleep 1
if [[ $(($SECONDS - $STARTTIME )) -gt $TIMEOUT ]]; then if [[ $(( SECONDS - STARTTIME )) -gt $TIMEOUT ]]; then
echo "Timed out on command: $@" >&2 echo "Timed out on command: $*" >&2
return 1 return 1
fi fi
done done
@ -94,12 +94,12 @@ function wait_for_finished_setup_in_container() {
repeat_until_success_or_timeout --fatal-test "container_is_running $1" "$TEST_TIMEOUT_IN_SECONDS" sh -c "docker logs $1 | grep 'is up and running'" || status=1 repeat_until_success_or_timeout --fatal-test "container_is_running $1" "$TEST_TIMEOUT_IN_SECONDS" sh -c "docker logs $1 | grep 'is up and running'" || status=1
if [[ $status -eq 1 ]]; then if [[ $status -eq 1 ]]; then
echo "Last $NUMBER_OF_LOG_LINES lines of container \`$1\`'s log" echo "Last $NUMBER_OF_LOG_LINES lines of container \`$1\`'s log"
docker logs $1 | tail -n $NUMBER_OF_LOG_LINES docker logs "$1" | tail -n "$NUMBER_OF_LOG_LINES"
fi fi
return $status return $status
} }
SETUP_FILE_MARKER="$BATS_TMPDIR/`basename \"$BATS_TEST_FILENAME\"`.setup_file" SETUP_FILE_MARKER="$BATS_TMPDIR/$(basename "$BATS_TEST_FILENAME").setup_file"
function native_setup_teardown_file_support() { function native_setup_teardown_file_support() {
VERSION_REGEX='([0-9]+)\.([0-9]+)\.([0-9]+)' VERSION_REGEX='([0-9]+)\.([0-9]+)\.([0-9]+)'