diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2016-02-11 13:09:03 +0300 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2016-02-11 13:09:03 +0300 |
| commit | ca2755ed6af0279b203da12e09bc4094af3aa49b (patch) | |
| tree | 03d2ea80354ff4ae53bf31ab046b1aee7da54de6 /autotest.sh | |
| parent | 5165998723925b414f688021aeaa8b90a844a918 (diff) | |
Wait until mariadb is up and running
Diffstat (limited to 'autotest.sh')
| -rwxr-xr-x | autotest.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/autotest.sh b/autotest.sh index 5196d5c31d5..f4c70f99b8a 100755 --- a/autotest.sh +++ b/autotest.sh @@ -193,9 +193,10 @@ function execute_tests { DATABASEHOST=$(docker inspect --format="{{.NetworkSettings.IPAddress}}" "$DOCKER_CONTAINER_ID") echo "Waiting for MariaDB initialisation ..." - - # grep exits on the first match and then the script continues - timeout 30 docker logs -f $DOCKER_CONTAINER_ID 2>&1 | grep -q "mysqld: ready for connections." + if ! apps/files_external/tests/env/wait-for-connection $DATABASEHOST 3306 60; then + echo "[ERROR] Waited 60 seconds, no response" >&2 + exit 1 + fi echo "MariaDB is up." |