From e39bb6d13c1b9598bfb227a3c0b94e50bfd4c298 Mon Sep 17 00:00:00 2001
From: Lukas Metzger <developer@lukas-metzger.com>
Date: Fri, 23 Mar 2018 18:43:48 +0100
Subject: [PATCH] Fixed error in test if password is empty

---
 .gitignore               |  1 +
 backend/test/logfile.log |  0
 backend/test/test.sh     | 14 ++++++++++++--
 3 files changed, 13 insertions(+), 2 deletions(-)
 delete mode 100644 backend/test/logfile.log

diff --git a/.gitignore b/.gitignore
index 9ab3eef..325c71c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ backend/src/config/ConfigUser.php
 backend/src/config/ConfigOverride.php
 backend/test/config.sh
 backend/test/node_modules/
+backend/test/logfile.log
diff --git a/backend/test/logfile.log b/backend/test/logfile.log
deleted file mode 100644
index e69de29..0000000
diff --git a/backend/test/test.sh b/backend/test/test.sh
index 50a8989..aa56810 100755
--- a/backend/test/test.sh
+++ b/backend/test/test.sh
@@ -60,7 +60,12 @@ then
     makeConfig
 
     echo "Preparing Database"
-    mysql "-h$DBHOST" "-u$DBUSER" "-p$DBPASSWORD" "$DBNAME" < db.sql
+    if [ -z "$DBPASSWORD" ]
+    then
+        mysql "-h$DBHOST" "-u$DBUSER" "$DBNAME" < db.sql
+    else
+        mysql "-h$DBHOST" "-u$DBUSER" "-p$DBPASSWORD" "$DBNAME" < db.sql
+    fi
 
     echo "Executing test"
     if ! node "tests/$2.js" "$TESTURL"
@@ -89,7 +94,12 @@ then
 
         echo -n $(basename $test .js) "..."
 
-        mysql "-h$DBHOST" "-u$DBUSER" "-p$DBPASSWORD" "$DBNAME" < db.sql
+        if [ -z "$DBPASSWORD" ]
+        then
+            mysql "-h$DBHOST" "-u$DBUSER" "$DBNAME" < db.sql
+        else
+            mysql "-h$DBHOST" "-u$DBUSER" "-p$DBPASSWORD" "$DBNAME" < db.sql
+        fi
 
         echo -n "..."