From 222f04b131ca9fc332c36ec8670d4587d15d78e2 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Tue, 13 Sep 2016 20:42:31 +0200 Subject: [PATCH] add actual check if mysql is up already --- autotest.sh | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/autotest.sh b/autotest.sh index 5f5633fcf0f..3f62657a90d 100755 --- a/autotest.sh +++ b/autotest.sh @@ -191,14 +191,6 @@ function execute_tests { -d mysql) DATABASEHOST=$(docker inspect --format="{{.NetworkSettings.IPAddress}}" "$DOCKER_CONTAINER_ID") - 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 - exit 1 - fi - - echo "MySQL is up." - else if [ -z "$DRONE" ] ; then # no need to drop the DB when we are on CI if [ "mysql" != "$(mysql --version | grep -o mysql)" ] ; then @@ -211,6 +203,11 @@ function execute_tests { DATABASEHOST=127.0.0.1 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 + exit 1 + fi fi if [ "$DB" == "mariadb" ] ; then if [ ! -z "$USEDOCKER" ] ; then -- 2.39.5