X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/f07e139b97ec44569470b024f3d6e21de8f2d032..657fdb79cbec:/tests/dtest.py diff --git a/tests/dtest.py b/tests/dtest.py index f17cf8e..74a7eb8 100644 --- a/tests/dtest.py +++ b/tests/dtest.py @@ -170,7 +170,6 @@ def default_config(encoding="UTF-8"): """home %s/home collection fs %s %s/tracks scratch %s/scratch.ogg -gap 0 queue_pad 5 stopword 01 02 03 04 05 06 07 08 09 10 stopword 1 2 3 4 5 6 7 8 9 @@ -286,6 +285,7 @@ def stop_daemon(): Stop the daemon if it has not stopped already""" global daemon if daemon == None: + print " (daemon not running)" return rc = daemon.poll() if rc == None: @@ -337,7 +337,9 @@ def run(module=None, report=True): except Exception, e: traceback.print_exc(None, sys.stderr) failures += 1 - stop_daemon() + finally: + stop_daemon() + os.system("ps -ef | grep disorderd") if report: if failures: print " FAILED"