diff options
| author | Lukas Reschke <lukas@owncloud.com> | 2016-06-26 13:55:05 +0300 |
|---|---|---|
| committer | Lukas Reschke <lukas@owncloud.com> | 2016-06-26 13:55:05 +0300 |
| commit | 7a9d60d87eb8e4414e5fe05830b088d426ff810d (patch) | |
| tree | 0fc97a7eacfd071475afd8bc6d4372babacb5740 /autotest.sh | |
| parent | 5387b942c44e05b87ba2a0fd54168f5278a31344 (diff) | |
| parent | 52eab2a61a5d27b64fcd0440b91f854c052933a9 (diff) | |
Merge remote-tracking branch 'upstream/master' into master-upstream-sync
Diffstat (limited to 'autotest.sh')
| -rwxr-xr-x | autotest.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/autotest.sh b/autotest.sh index 4dda2be43e5..f237f8aa11a 100755 --- a/autotest.sh +++ b/autotest.sh @@ -192,8 +192,8 @@ function execute_tests { 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 60; then - echo "[ERROR] Waited 60 seconds, no response" >&2 + if ! apps/files_external/tests/env/wait-for-connection $DATABASEHOST 3306 600; then + echo "[ERROR] Waited 600 seconds, no response" >&2 exit 1 fi @@ -221,8 +221,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 60; then - echo "[ERROR] Waited 60 seconds, no response" >&2 + if ! apps/files_external/tests/env/wait-for-connection $DATABASEHOST 3306 600; then + echo "[ERROR] Waited 600 seconds, no response" >&2 exit 1 fi |