From 004d670d31c4cf28f52522733d7b127bf8f2df21 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Wed, 15 Jul 2015 15:38:50 +0200 Subject: [autotest] wait for oracle docker container initialization instead of waiting a hard coded time --- autotest.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'autotest.sh') diff --git a/autotest.sh b/autotest.sh index 4fa51e2d071..960f03ec1f6 100755 --- a/autotest.sh +++ b/autotest.sh @@ -165,8 +165,10 @@ function execute_tests { DOCKER_CONTAINER_ID=$(docker run -d deepdiver/docker-oracle-xe-11g) DATABASEHOST=$(docker inspect "$DOCKER_CONTAINER_ID" | grep IPAddress | cut -d '"' -f 4) - echo "Waiting 120 seconds for Oracle initialization ... " - sleep 120 + 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." DATABASEUSER=autotest DATABASENAME='XE' -- cgit v1.2.3