No need to wait 10 minutes for the DB to get up.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
parent
ecd0d39c30
commit
60c7ef7f5e
16
autotest.sh
16
autotest.sh
|
@ -215,8 +215,8 @@ function execute_tests {
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
echo "Waiting for MySQL initialisation ..."
|
echo "Waiting for MySQL initialisation ..."
|
||||||
if ! apps/files_external/tests/env/wait-for-connection $DATABASEHOST 3306 600; then
|
if ! apps/files_external/tests/env/wait-for-connection $DATABASEHOST 3306 300; then
|
||||||
echo "[ERROR] Waited 600 seconds, no response" >&2
|
echo "[ERROR] Waited 300 seconds, no response" >&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
@ -251,8 +251,8 @@ function execute_tests {
|
||||||
|
|
||||||
echo "Waiting for MySQL(utf8mb4) initialisation ..."
|
echo "Waiting for MySQL(utf8mb4) initialisation ..."
|
||||||
|
|
||||||
if ! apps/files_external/tests/env/wait-for-connection $DATABASEHOST 3306 600; then
|
if ! apps/files_external/tests/env/wait-for-connection $DATABASEHOST 3306 300; then
|
||||||
echo "[ERROR] Waited 600 seconds, no response" >&2
|
echo "[ERROR] Waited 300 seconds, no response" >&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
sleep 1
|
sleep 1
|
||||||
|
@ -275,8 +275,8 @@ function execute_tests {
|
||||||
DATABASEHOST=$(docker inspect --format="{{.NetworkSettings.IPAddress}}" "$DOCKER_CONTAINER_ID")
|
DATABASEHOST=$(docker inspect --format="{{.NetworkSettings.IPAddress}}" "$DOCKER_CONTAINER_ID")
|
||||||
|
|
||||||
echo "Waiting for MariaDB initialisation ..."
|
echo "Waiting for MariaDB initialisation ..."
|
||||||
if ! apps/files_external/tests/env/wait-for-connection $DATABASEHOST 3306 600; then
|
if ! apps/files_external/tests/env/wait-for-connection $DATABASEHOST 3306 300; then
|
||||||
echo "[ERROR] Waited 600 seconds, no response" >&2
|
echo "[ERROR] Waited 300 seconds, no response" >&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -296,8 +296,8 @@ function execute_tests {
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "Waiting for MariaDB initialisation ..."
|
echo "Waiting for MariaDB initialisation ..."
|
||||||
if ! apps/files_external/tests/env/wait-for-connection $DATABASEHOST 3306 600; then
|
if ! apps/files_external/tests/env/wait-for-connection $DATABASEHOST 3306 300; then
|
||||||
echo "[ERROR] Waited 600 seconds, no response" >&2
|
echo "[ERROR] Waited 300 seconds, no response" >&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue