More bzr->git transition fallout.

[disorder] / tests / dtest.py

diff --git a/tests/dtest.py b/tests/dtest.py
index 235d746..a5a8be9 100644 (file)
--- a/tests/dtest.py
+++ b/tests/dtest.py
@@ -85,7 +85,7 @@ Make track with relative path S exist"""
     trackdir = os.path.dirname(trackpath)
     if not os.path.exists(trackdir):
         os.makedirs(trackdir)
-    copyfile("%s/sounds/long.ogg" % top_builddir, trackpath)
+    copyfile("%s/sounds/long.ogg" % top_srcdir, trackpath)
     # We record the tracks we created so they can be tested against
     # server responses.  We put them into NFC since that's what the server
     # uses internally.
@@ -286,6 +286,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 +338,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"