summaryrefslogtreecommitdiffstats
path: root/tests/run_pyload.sh
diff options
context:
space:
mode:
authorGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2013-06-29 19:32:06 +0200
committerGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2013-06-29 19:32:06 +0200
commitfacb379f3b6cdc5423f8400d756822f5f7890e2c (patch)
tree55e23c03ffdc71206fb9c50be485bd9d34dc9633 /tests/run_pyload.sh
parentfixed capitalization of dependency (diff)
downloadpyload-facb379f3b6cdc5423f8400d756822f5f7890e2c.tar.xz
updated test suite
Diffstat (limited to 'tests/run_pyload.sh')
-rwxr-xr-xtests/run_pyload.sh11
1 files changed, 9 insertions, 2 deletions
diff --git a/tests/run_pyload.sh b/tests/run_pyload.sh
index c272ad3c7..9ffc04b4f 100755
--- a/tests/run_pyload.sh
+++ b/tests/run_pyload.sh
@@ -1,4 +1,11 @@
-#/usr/bin/env bash
+#!/usr/bin/env bash
+
+PIDFILE="tests/pyload.pid"
+if [ -f "$PIDFILE" ]
+then
+ kill -9 $(<"$PIDFILE")
+fi
+
cp tests/config/pyload.db.org tests/config/pyload.db
cp tests/config/pyload.conf.org tests/config/pyload.conf
@@ -9,7 +16,7 @@ touch pyload.out
$PYTHON pyload.py -d --configdir=tests/config > pyload.out 2> pyload.err &
for i in {1..30}; do
- grep 8001 pyload.out > /dev/null && echo "pyLoad started" && break
+ grep "pyLoad is up and running" pyload.out > /dev/null && echo "pyLoad started" && break
sleep 1
done