Skip to content

Commit 3776f7e

Browse files
authored
Merge pull request #16981 from nextcloud/fix/timeout/300
No need to wait 10 minutes for the DB to get up.
2 parents b3292b6 + 60c7ef7 commit 3776f7e

1 file changed

Lines changed: 8 additions & 8 deletions

File tree

autotest.sh

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -215,8 +215,8 @@ function execute_tests {
215215
fi
216216
fi
217217
echo "Waiting for MySQL initialisation ..."
218-
if ! apps/files_external/tests/env/wait-for-connection $DATABASEHOST 3306 600; then
219-
echo "[ERROR] Waited 600 seconds, no response" >&2
218+
if ! apps/files_external/tests/env/wait-for-connection $DATABASEHOST 3306 300; then
219+
echo "[ERROR] Waited 300 seconds, no response" >&2
220220
exit 1
221221
fi
222222
fi
@@ -251,8 +251,8 @@ function execute_tests {
251251

252252
echo "Waiting for MySQL(utf8mb4) initialisation ..."
253253

254-
if ! apps/files_external/tests/env/wait-for-connection $DATABASEHOST 3306 600; then
255-
echo "[ERROR] Waited 600 seconds, no response" >&2
254+
if ! apps/files_external/tests/env/wait-for-connection $DATABASEHOST 3306 300; then
255+
echo "[ERROR] Waited 300 seconds, no response" >&2
256256
exit 1
257257
fi
258258
sleep 1
@@ -275,8 +275,8 @@ function execute_tests {
275275
DATABASEHOST=$(docker inspect --format="{{.NetworkSettings.IPAddress}}" "$DOCKER_CONTAINER_ID")
276276

277277
echo "Waiting for MariaDB initialisation ..."
278-
if ! apps/files_external/tests/env/wait-for-connection $DATABASEHOST 3306 600; then
279-
echo "[ERROR] Waited 600 seconds, no response" >&2
278+
if ! apps/files_external/tests/env/wait-for-connection $DATABASEHOST 3306 300; then
279+
echo "[ERROR] Waited 300 seconds, no response" >&2
280280
exit 1
281281
fi
282282

@@ -296,8 +296,8 @@ function execute_tests {
296296
fi
297297

298298
echo "Waiting for MariaDB initialisation ..."
299-
if ! apps/files_external/tests/env/wait-for-connection $DATABASEHOST 3306 600; then
300-
echo "[ERROR] Waited 600 seconds, no response" >&2
299+
if ! apps/files_external/tests/env/wait-for-connection $DATABASEHOST 3306 300; then
300+
echo "[ERROR] Waited 300 seconds, no response" >&2
301301
exit 1
302302
fi
303303

0 commit comments

Comments
 (0)