From c316c040c5bed10e8480bfb61bede0603970bb7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20M=C3=B6hlmann?= Date: Sun, 7 Oct 2018 14:08:45 +0300 Subject: [PATCH] Use travis_wait for sleep --- tests/compose/test-script.sh | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/tests/compose/test-script.sh b/tests/compose/test-script.sh index a1ae2cf4..0a3c2237 100755 --- a/tests/compose/test-script.sh +++ b/tests/compose/test-script.sh @@ -12,16 +12,8 @@ containers=( front ) -# Verbose sleep, to prevent Travis to cancel the build -# First argument is desired sleep time in minutes -v_sleep() { - COUNT=$1 - until [ $COUNT -eq 0 ]; do - echo "Sleep for $COUNT more minutes" - sleep 1m - ((COUNT--)) - done; -} +# Time to sleep in minutes after starting the containers +WAIT=1 containers_check() { status=0 @@ -56,8 +48,8 @@ die() { for file in tests/compose/*.env ; do cp $file .env docker-compose -f tests/compose/run.yml -p $DOCKER_ORG up -d - echo "\n" # Clean terminal distortion from docker-compose in travis - v_sleep 1 + echo -e "\nSleeping for ${WAIT} minutes" # Clean terminal distortion from docker-compose in travis + travis_wait sleep ${WAIT}m || sleep ${WAIT}m #Fallback sleep for local run container_logs containers_check || die 1 clean