Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2019-03-05 11:31:45 +0300
committerJoas Schilling <coding@schilljs.com>2019-03-05 11:31:45 +0300
commitc32c91d1da11444619f545e18c2c39732326c8a8 (patch)
treecdf5840dc6571e4ec38f128786b28f3a0573503b /autotest.sh
parente18cc22ed9c95d39fcd153ad1725df43623a123d (diff)
Fix whitespaces
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'autotest.sh')
-rwxr-xr-xautotest.sh45
1 files changed, 23 insertions, 22 deletions
diff --git a/autotest.sh b/autotest.sh
index 974573a4c76..ca0f16c7d8e 100755
--- a/autotest.sh
+++ b/autotest.sh
@@ -204,21 +204,21 @@ function execute_tests {
else
if [ -z "$DRONE" ] ; then # no need to drop the DB when we are on CI
- if [ "mysql" != "$(mysql --version | grep -o mysql)" ] ; then
- echo "Your mysql binary is not provided by mysql"
- echo "To use the docker container set the USEDOCKER environment variable"
- exit -1
- fi
- mysql -u "$DATABASEUSER" -powncloud -e "DROP DATABASE IF EXISTS $DATABASENAME" -h $DATABASEHOST || true
- else
- DATABASEHOST=mysql
- fi
+ if [ "mysql" != "$(mysql --version | grep -o mysql)" ] ; then
+ echo "Your mysql binary is not provided by mysql"
+ echo "To use the docker container set the USEDOCKER environment variable"
+ exit -1
+ fi
+ mysql -u "$DATABASEUSER" -powncloud -e "DROP DATABASE IF EXISTS $DATABASENAME" -h $DATABASEHOST || true
+ else
+ DATABASEHOST=mysql
+ fi
+ fi
+ echo "Waiting for MySQL initialisation ..."
+ if ! apps/files_external/tests/env/wait-for-connection $DATABASEHOST 3306 600; then
+ echo "[ERROR] Waited 600 seconds, no response" >&2
+ exit 1
fi
- echo "Waiting for MySQL initialisation ..."
- if ! apps/files_external/tests/env/wait-for-connection $DATABASEHOST 3306 600; then
- echo "[ERROR] Waited 600 seconds, no response" >&2
- exit 1
- fi
fi
if [ "$DB" == "mysqlmb4" ] ; then
if [ ! -z "$USEDOCKER" ] ; then
@@ -331,13 +331,13 @@ function execute_tests {
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
+ 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'
@@ -432,7 +432,8 @@ fi
# NOTES on pgsql:
# - su - postgres
# - createuser -P oc_autotest (enter password and enable superuser)
-# - to enable dropdb I decided to add following line to pg_hba.conf (this is not the safest way but I don't care for the testing machine):
+# - to enable dropdb I decided to add following line to pg_hba.conf
+# (this is not the safest way but I don't care for the testing machine):
# local all all trust
#
# - for parallel executor support with EXECUTOR_NUMBER=0: