From 60c7ef7f5e0bbba25717091a41b6150cb8516a1c Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Tue, 3 Sep 2019 15:38:52 +0200 Subject: [PATCH] No need to wait 10 minutes for the DB to get up. Signed-off-by: Roeland Jago Douma --- autotest.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/autotest.sh b/autotest.sh index db24517e08..324570dd30 100755 --- a/autotest.sh +++ b/autotest.sh @@ -215,8 +215,8 @@ function execute_tests { fi fi echo "Waiting for MySQL initialisation ..." - if ! apps/files_external/tests/env/wait-for-connection $DATABASEHOST 3306 600; then - echo "[ERROR] Waited 600 seconds, no response" >&2 + if ! apps/files_external/tests/env/wait-for-connection $DATABASEHOST 3306 300; then + echo "[ERROR] Waited 300 seconds, no response" >&2 exit 1 fi fi @@ -251,8 +251,8 @@ function execute_tests { echo "Waiting for MySQL(utf8mb4) initialisation ..." - if ! apps/files_external/tests/env/wait-for-connection $DATABASEHOST 3306 600; then - echo "[ERROR] Waited 600 seconds, no response" >&2 + if ! apps/files_external/tests/env/wait-for-connection $DATABASEHOST 3306 300; then + echo "[ERROR] Waited 300 seconds, no response" >&2 exit 1 fi sleep 1 @@ -275,8 +275,8 @@ function execute_tests { DATABASEHOST=$(docker inspect --format="{{.NetworkSettings.IPAddress}}" "$DOCKER_CONTAINER_ID") echo "Waiting for MariaDB initialisation ..." - if ! apps/files_external/tests/env/wait-for-connection $DATABASEHOST 3306 600; then - echo "[ERROR] Waited 600 seconds, no response" >&2 + if ! apps/files_external/tests/env/wait-for-connection $DATABASEHOST 3306 300; then + echo "[ERROR] Waited 300 seconds, no response" >&2 exit 1 fi @@ -296,8 +296,8 @@ function execute_tests { fi echo "Waiting for MariaDB initialisation ..." - if ! apps/files_external/tests/env/wait-for-connection $DATABASEHOST 3306 600; then - echo "[ERROR] Waited 600 seconds, no response" >&2 + if ! apps/files_external/tests/env/wait-for-connection $DATABASEHOST 3306 300; then + echo "[ERROR] Waited 300 seconds, no response" >&2 exit 1 fi