From a6daafa3cdaf4c01f88a890004cc63bdecff99fc Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Thu, 16 Jul 2015 09:49:23 +0200
Subject: [autotest] timeout oracle docker startup after 2 minutes

---
 autotest.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'autotest.sh')

diff --git a/autotest.sh b/autotest.sh
index 960f03ec1f6..e9327c8f83e 100755
--- a/autotest.sh
+++ b/autotest.sh
@@ -167,8 +167,8 @@ function execute_tests {
 
 		echo "Waiting for Oracle initialization ... "
 
-		# grep exits on the first match and then the script continues
-		docker logs -f "$DOCKER_CONTAINER_ID" 2>&1 | grep -q "Grant succeeded."
+		# grep exits on the first match and then the script continues - times out after 2 minutes
+		timeout 120 docker logs -f "$DOCKER_CONTAINER_ID" 2>&1 | grep -q "Grant succeeded."
 
 		DATABASEUSER=autotest
 		DATABASENAME='XE'
-- 
cgit v1.2.3