sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix whitespaces 

Signed-off-by: Joas Schilling <coding@schilljs.com>
pull/14528/head
Joas Schilling 2019-03-05 09:31:45 +07:00
parent e18cc22ed9
commit c32c91d1da
No known key found for this signature in database
GPG Key ID: 7076EA9751AACDDA
1 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
autotest.sh
Unescape Escape View File

@ -204,21 +204,21 @@ function execute_tests {
else else
if [ -z "$DRONE" ] ; then # no need to drop the DB when we are on CI if [ -z "$DRONE" ] ; then # no need to drop the DB when we are on CI
if [ "mysql" != "$(mysql --version | grep -o mysql)" ] ; then if [ "mysql" != "$(mysql --version | grep -o mysql)" ] ; then
echo "Your mysql binary is not provided by mysql" echo "Your mysql binary is not provided by mysql"
echo "To use the docker container set the USEDOCKER environment variable" echo "To use the docker container set the USEDOCKER environment variable"
exit -1 exit -1
fi fi
mysql -u "$DATABASEUSER" -powncloud -e "DROP DATABASE IF EXISTS $DATABASENAME" -h $DATABASEHOST || true mysql -u "$DATABASEUSER" -powncloud -e "DROP DATABASE IF EXISTS $DATABASENAME" -h $DATABASEHOST || true
else else
DATABASEHOST=mysql DATABASEHOST=mysql
fi 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 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 fi
if [ "$DB" == "mysqlmb4" ] ; then if [ "$DB" == "mysqlmb4" ] ; then
if [ ! -z "$USEDOCKER" ] ; then if [ ! -z "$USEDOCKER" ] ; then
@ -331,13 +331,13 @@ function execute_tests {
echo "Waiting for Oracle initialization ... " echo "Waiting for Oracle initialization ... "
# Try to connect to the OCI host via sqlplus to ensure that the connection is already running # Try to connect to the OCI host via sqlplus to ensure that the connection is already running
for i in {1..48} for i in {1..48}
do do
if sqlplus "autotest/owncloud@(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(Host=$DATABASEHOST)(Port=1521))(CONNECT_DATA=(SID=XE)))" < /dev/null | grep 'Connected to'; then if sqlplus "autotest/owncloud@(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(Host=$DATABASEHOST)(Port=1521))(CONNECT_DATA=(SID=XE)))" < /dev/null | grep 'Connected to'; then
break; break;
fi fi
sleep 5 sleep 5
done done
DATABASEUSER=autotest DATABASEUSER=autotest
DATABASENAME='XE' DATABASENAME='XE'
@ -432,7 +432,8 @@ fi
# NOTES on pgsql: # NOTES on pgsql:
# - su - postgres # - su - postgres
# - createuser -P oc_autotest (enter password and enable superuser) # - 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 # local all all trust
# #
# - for parallel executor support with EXECUTOR_NUMBER=0: # - for parallel executor support with EXECUTOR_NUMBER=0: