Move --wait-for-root to disorderd.

[disorder] / tests / dtest.py

diff --git a/tests/dtest.py b/tests/dtest.py
index ec42e70..049eadf 100644 (file)
--- 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
@@ -256,8 +255,8 @@ Start the daemon."""
     if waited > 0:
         print "  took about %ss for socket to appear" % waited
     # Wait for root user to be created
-    command(["disorder",
-             "--config", disorder._configfile, "--no-per-user-config",
+    command(["disorderd",
+             "--config", disorder._configfile,
              "--wait-for-root"])
 
 def create_user(username="fred", password="fredpass"):
@@ -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:
@@ -339,6 +339,7 @@ def run(module=None, report=True):
         failures += 1
     finally:
         stop_daemon()
+        os.system("ps -ef | grep disorderd")
     if report:
         if failures:
             print " FAILED"