mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add actual check if mysql is up already

This commit is contained in:
Morris Jobke 2016-09-13 20:42:31 +02:00
parent 9ca848c317
commit 222f04b131
No known key found for this signature in database
GPG Key ID: 9CE5ED29E7FCD38A
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
autotest.sh
View File

@ -191,14 +191,6 @@ function execute_tests {
-d mysql) -d mysql)
DATABASEHOST=$(docker inspect --format="{{.NetworkSettings.IPAddress}}" "$DOCKER_CONTAINER_ID") DATABASEHOST=$(docker inspect --format="{{.NetworkSettings.IPAddress}}" "$DOCKER_CONTAINER_ID")
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 "MySQL is up."
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
@ -211,6 +203,11 @@ function execute_tests {
DATABASEHOST=127.0.0.1 DATABASEHOST=127.0.0.1
fi 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 fi
if [ "$DB" == "mariadb" ] ; then if [ "$DB" == "mariadb" ] ; then
if [ ! -z "$USEDOCKER" ] ; then if [ ! -z "$USEDOCKER" ] ; then