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

Change 'until' style (#3366)

Browse source
This commit is contained in:
Casper 2023-05-26 07:42:03 +02:00 committed by GitHub
parent c2d0b748b2
commit 8512dba8ad
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
test/helper/common.bash
View file

@ -182,8 +182,7 @@ function _repeat_until_success_or_timeout() {
local STARTTIME=${SECONDS} local STARTTIME=${SECONDS}
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
@ -215,8 +214,7 @@ function _run_until_success_or_timeout() {
local STARTTIME=${SECONDS} local STARTTIME=${SECONDS}
# shellcheck disable=SC2154 # shellcheck disable=SC2154
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
@ -260,8 +258,7 @@ function _wait_for_smtp_port_in_container_to_respond() {
local CONTAINER_NAME=$(__handle_container_name "${1:-}") local CONTAINER_NAME=$(__handle_container_name "${1:-}")
local COUNT=0 local COUNT=0
until [[ $(_exec_in_container timeout 10 /bin/bash -c 'echo QUIT | nc localhost 25') == *'221 2.0.0 Bye'* ]] until [[ $(_exec_in_container timeout 10 /bin/bash -c 'echo QUIT | nc localhost 25') == *'221 2.0.0 Bye'* ]]; do
do
if [[ ${COUNT} -eq 20 ]]; then if [[ ${COUNT} -eq 20 ]]; then
echo "Unable to receive a valid response from 'nc localhost 25' within 20 seconds" echo "Unable to receive a valid response from 'nc localhost 25' within 20 seconds"
return 1 return 1

6
test/test_helper/common.bash
View file

@ -37,8 +37,7 @@ function repeat_until_success_or_timeout {
local STARTTIME=${SECONDS} local STARTTIME=${SECONDS}
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
@ -66,8 +65,7 @@ function run_until_success_or_timeout {
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