diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-07-17 13:51:20 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-07-17 13:51:20 +0200 |
| commit | de555cf229a7277dc21e415fd968ddeacc3606fc (patch) | |
| tree | 8eb1349175ca27b96d4f127181aa0a375111b3bb | |
| parent | f7a78cf650951b17b79560a6c0246ad72ee6c9bf (diff) | |
| parent | a6daafa3cdaf4c01f88a890004cc63bdecff99fc (diff) | |
| download | nextcloud-server-de555cf229a7277dc21e415fd968ddeacc3606fc.tar.gz nextcloud-server-de555cf229a7277dc21e415fd968ddeacc3606fc.zip | |
Merge pull request #17670 from owncloud/timeout-oracle-docker-startup
[autotest] timeout oracle docker startup after 2 minutes
| -rwxr-xr-x | autotest.sh | 4 |
1 files changed, 2 insertions, 2 deletions
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' |