deblan/pdnsmanager
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed error in test if password is empty

Browse source
This commit is contained in:
Lukas Metzger 2018-03-23 18:43:48 +01:00
parent 8c7fbf40ef
commit e39bb6d13c
3 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -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

0
backend/test/logfile.log
View file

14
backend/test/test.sh
View file

@ -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 "..."