Merge pull request #17670 from owncloud/timeout-oracle-docker-startup

[autotest] timeout oracle docker startup after 2 minutes
This commit is contained in:
Thomas Müller 2015-07-17 13:51:20 +02:00
commit de555cf229
1 changed files with 2 additions and 2 deletions

View File

@ -167,8 +167,8 @@ function execute_tests {
echo "Waiting for Oracle initialization ... " echo "Waiting for Oracle initialization ... "
# grep exits on the first match and then the script continues # grep exits on the first match and then the script continues - times out after 2 minutes
docker logs -f "$DOCKER_CONTAINER_ID" 2>&1 | grep -q "Grant succeeded." timeout 120 docker logs -f "$DOCKER_CONTAINER_ID" 2>&1 | grep -q "Grant succeeded."
DATABASEUSER=autotest DATABASEUSER=autotest
DATABASENAME='XE' DATABASENAME='XE'