From 526d36c290c829eda005d6a643648e0769547753 Mon Sep 17 00:00:00 2001
From: Vincent Petry <vincent@nextcloud.com>
Date: Fri, 2 Jul 2021 15:26:06 +0200
Subject: [PATCH] Add connection check in autotest.sh for pgsql docker

When using pgsql docker for testing locally with autotest, make sure to
properly wait for the port to be available.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
---
 autotest.sh | 6 ++++--
 1 file 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