summaryrefslogtreecommitdiffstats
path: root/autotest.sh
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2015-07-15 15:38:50 +0200
committerMorris Jobke <hey@morrisjobke.de>2015-07-15 15:38:50 +0200
commit004d670d31c4cf28f52522733d7b127bf8f2df21 (patch)
tree0e8ffdbadfe8037d83c6678b950f26a33226c934 /autotest.sh
parente46ec4a6b6fd48cf7684daa1e2d6b266162600c6 (diff)
downloadnextcloud-server-004d670d31c4cf28f52522733d7b127bf8f2df21.tar.gz
nextcloud-server-004d670d31c4cf28f52522733d7b127bf8f2df21.zip
[autotest] wait for oracle docker container initialization instead of waiting a hard coded time
Diffstat (limited to 'autotest.sh')
-rwxr-xr-xautotest.sh6
1 files changed, 4 insertions, 2 deletions
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'