diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2015-07-16 09:49:23 +0200 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2015-07-16 11:51:15 +0200 |
| commit | a6daafa3cdaf4c01f88a890004cc63bdecff99fc (patch) | |
| tree | df89837a57664a5cb4225cb525190731b4ce3ba5 /autotest.sh | |
| parent | dce462c28db1d5e5b144efcfb26a466bd290621c (diff) | |
| download | nextcloud-server-a6daafa3cdaf4c01f88a890004cc63bdecff99fc.tar.gz nextcloud-server-a6daafa3cdaf4c01f88a890004cc63bdecff99fc.zip | |
[autotest] timeout oracle docker startup after 2 minutes
Diffstat (limited to 'autotest.sh')
| -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' |