@ -212,7 +212,7 @@ function execute_tests {
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 = 127.0.0.1
DATABASEHOST = mysql
fi
fi
fi
fi
echo "Waiting for MySQL initialisation ..."
echo "Waiting for MySQL initialisation ..."
@ -246,7 +246,7 @@ function execute_tests {
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 = 127.0.0.1
DATABASEHOST = mysqlmb4
fi
fi
fi
fi
@ -308,6 +308,9 @@ function execute_tests {
echo "Postgres is up."
echo "Postgres is up."
else
else
if [ ! -z " $DRONE " ] ; then
DATABASEHOST = postgres
fi
echo "Waiting for Postgres to be available ..."
echo "Waiting for Postgres to be available ..."
if ! apps/files_external/tests/env/wait-for-connection $DATABASEHOST 5432 60; then
if ! apps/files_external/tests/env/wait-for-connection $DATABASEHOST 5432 60; then
echo "[ERROR] Waited 60 seconds, no response" >& 2
echo "[ERROR] Waited 60 seconds, no response" >& 2