diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-07-15 17:26:40 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-07-15 17:26:40 +0200 |
| commit | dce462c28db1d5e5b144efcfb26a466bd290621c (patch) | |
| tree | 0ee87ee4357e5834ef821dfa5220f1b37d704b89 /autotest.sh | |
| parent | a5016cfee8ee7dd6ac642063edb09152c5820c2a (diff) | |
| parent | 004d670d31c4cf28f52522733d7b127bf8f2df21 (diff) | |
| download | nextcloud-server-dce462c28db1d5e5b144efcfb26a466bd290621c.tar.gz nextcloud-server-dce462c28db1d5e5b144efcfb26a466bd290621c.zip | |
Merge pull request #17660 from owncloud/properly-wait-for-oracle-docker
[autotest] wait for oracle docker container initialization instead of…
Diffstat (limited to 'autotest.sh')
| -rwxr-xr-x | autotest.sh | 6 |
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' |