aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulius Härtl <jus@bitgrid.net>2021-07-02 17:42:29 +0200
committerGitHub <noreply@github.com>2021-07-02 17:42:29 +0200
commit24a853239309a063a9c4ea5b620add3e47fdcfdd (patch)
treeb50168f1f47469c19f828efc05b7292503be877d
parent8ebbd91909dff3c216dd646f430a776219a49c5e (diff)
parent526d36c290c829eda005d6a643648e0769547753 (diff)
downloadnextcloud-server-24a853239309a063a9c4ea5b620add3e47fdcfdd.tar.gz
nextcloud-server-24a853239309a063a9c4ea5b620add3e47fdcfdd.zip
Merge pull request #27771 from nextcloud/bugfix/noid/autotest-wait-pgsql-docker
Add connection check in autotest.sh for pgsql docker
-rwxr-xr-xautotest.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/autotest.sh b/autotest.sh
index 7214df18b14..cf166a79186 100755
--- a/autotest.sh
+++ b/autotest.sh
@@ -309,8 +309,10 @@ function execute_tests {
echo "Waiting for Postgres initialisation ..."
- # grep exits on the first match and then the script continues
- docker logs -f "$DOCKER_CONTAINER_ID" 2>&1 | grep -q "database system is ready to accept connections"
+ if ! apps/files_external/tests/env/wait-for-connection $DATABASEHOST 5432 60; then
+ echo "[ERROR] Waited 60 seconds for $DATABASEHOST, no response" >&2
+ exit 1
+ fi
echo "Postgres is up."
else