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

small changes in common.bash

This commit is contained in:
Georg Lauterbach 2020-10-19 14:10:32 +02:00
parent 3f5c518950
commit ab1da1e3f3
No known key found for this signature in database
GPG Key ID: 386D76E7AD496709
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
test/test_helper/common.bash
View File

@ -1,6 +1,7 @@
load 'test_helper/bats-support/load' load 'test_helper/bats-support/load'
load 'test_helper/bats-assert/load' load 'test_helper/bats-assert/load'
# shellcheck disable=SC2034
NAME=tvial/docker-mailserver:testing NAME=tvial/docker-mailserver:testing
# default timeout is 120 seconds # default timeout is 120 seconds
@ -25,7 +26,7 @@ function repeat_until_success_or_timeout {
shift 1 shift 1
until "${@}" until "${@}"
do do
if [[ -n "${FATAL_FAILURE_TEST_COMMAND}" ]] && ! eval "${FATAL_FAILURE_TEST_COMMAND}"; then if [[ -n ${FATAL_FAILURE_TEST_COMMAND} ]] && ! eval "${FATAL_FAILURE_TEST_COMMAND}"; then
echo "\`${FATAL_FAILURE_TEST_COMMAND}\` failed, early aborting repeat_until_success of \`${*}\`" >&2 echo "\`${FATAL_FAILURE_TEST_COMMAND}\` failed, early aborting repeat_until_success of \`${*}\`" >&2
return 1 return 1
fi fi
@ -41,14 +42,14 @@ function repeat_until_success_or_timeout {
# @param ${1} timeout # @param ${1} timeout
# @param ... test command to run # @param ... test command to run
function run_until_success_or_timeout { function run_until_success_or_timeout {
if ! [[ "${1}" =~ ^[0-9]+$ ]]; then if ! [[ ${1} =~ ^[0-9]+$ ]]; then
echo "First parameter for timeout must be an integer, recieved \"${1}\"" echo "First parameter for timeout must be an integer, recieved \"${1}\""
return 1 return 1
fi fi
local TIMEOUT=${1} local TIMEOUT=${1}
local STARTTIME=${SECONDS} local STARTTIME=${SECONDS}
shift 1 shift 1
until run "${@}" && [[ ${status} -eq 0 ]] until run "${@}" && [[ $status -eq 0 ]]
do do
sleep 1 sleep 1
if (( SECONDS - STARTTIME > TIMEOUT )); then if (( SECONDS - STARTTIME > TIMEOUT )); then
@ -75,7 +76,7 @@ function container_is_running() {
# @param ${1} port # @param ${1} port
# @param ${2} container name # @param ${2} container name
function wait_for_tcp_port_in_container() { function wait_for_tcp_port_in_container() {
repeat_until_success_or_timeout --fatal-test "container_is_running ${2}" "${TEST_TIMEOUT_IN_SECONDS}" docker exec ${2} /bin/sh -c "nc -z 0.0.0.0 ${1}" repeat_until_success_or_timeout --fatal-test "container_is_running ${2}" "${TEST_TIMEOUT_IN_SECONDS}" docker exec "${2}" /bin/sh -c "nc -z 0.0.0.0 ${1}"
} }
# @param ${1} name of the postfix container # @param ${1} name of the postfix container
@ -177,6 +178,6 @@ function wait_for_service() {
function wait_for_changes_to_be_detected_in_container() { function wait_for_changes_to_be_detected_in_container() {
local CONTAINER_NAME="${1}" local CONTAINER_NAME="${1}"
local TIMEOUT=${TEST_TIMEOUT_IN_SECONDS} local TIMEOUT=${TEST_TIMEOUT_IN_SECONDS}
repeat_in_container_until_success_or_timeout "${TIMEOUT}" "${CONTAINER_NAME}" \ # shellcheck disable=SC2016
bash -c 'source /usr/local/bin/helper_functions.sh; cmp --silent -- <(_monitored_files_checksums) "${CHKSUM_FILE}" >/dev/null' repeat_in_container_until_success_or_timeout "${TIMEOUT}" "${CONTAINER_NAME}" bash -c 'source /usr/local/bin/helper_functions.sh; cmp --silent -- <(_monitored_files_checksums) "${CHKSUM_FILE}" >/dev/null'
} }