From b569d0c2502f8806c76e1faebe26818daf9b213b Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Wed, 13 Jul 2016 20:23:00 +0200 Subject: Fix oracle unit test on 8.1 (#25471) --- autotest.sh | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/autotest.sh b/autotest.sh index 46c55edef19..fd4c0c031e2 100755 --- a/autotest.sh +++ b/autotest.sh @@ -150,10 +150,17 @@ function execute_tests { if [ "$1" == "oci" ] ; then echo "Fire up the oracle docker" 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 + DATABASEHOST=$(docker inspect --format="{{.NetworkSettings.IPAddress}}" "$DOCKER_CONTAINER_ID") + + echo "Waiting for Oracle initialization ... " + # Try to connect to the OCI host via sqlplus to ensure that the connection is already running + for i in {1..48} + do + if sqlplus "autotest/owncloud@(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(Host=$DATABASEHOST)(Port=1521))(CONNECT_DATA=(SID=XE)))" < /dev/null | grep 'Connected to'; then + break; + fi + sleep 5 + done DATABASEUSER=autotest DATABASENAME='XE' @@ -161,7 +168,9 @@ function execute_tests { # trigger installation echo "Installing ...." + echo ./occ maintenance:install --database="$1" --database-name="$DATABASENAME" --database-host="$DATABASEHOST" --database-user="$DATABASEUSER" --database-pass=owncloud --database-table-prefix=oc_ --admin-user="$ADMINLOGIN" --admin-pass=admin --data-dir="$DATADIR" "$PHP" ./occ maintenance:install --database="$1" --database-name="$DATABASENAME" --database-host="$DATABASEHOST" --database-user="$DATABASEUSER" --database-pass=owncloud --database-table-prefix=oc_ --admin-user="$ADMINLOGIN" --admin-pass=admin --data-dir="$DATADIR" + more config/config.php #test execution echo "Testing with $1 ..." -- cgit v1.2.3