Merge tag 'branchpoint-5.1' into release

[disorder] / tests / dtest.py

diff --git a/tests/dtest.py b/tests/dtest.py
index ec42e702ff7b1c805291c365bce0e4c8b0643bc0..a8ea64cdb526ecc136e269c7596be743a09e17ff 100644 (file)
--- a/tests/dtest.py
+++ b/tests/dtest.py
@@ -1,7 +1,7 @@
 #-*-python-*-
 #
 # This file is part of DisOrder.
 #-*-python-*-
 #
 # This file is part of DisOrder.

-# Copyright (C) 2007-2009 Richard Kettlewell
+# Copyright (C) 2007-2012 Richard Kettlewell

 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by


@@ -170,7 +170,6 @@ def default_config(encoding="UTF-8"):
     """home %s/home
 collection fs %s %s/tracks
 scratch %s/scratch.ogg
     """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
 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
     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"):
              "--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:
 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:
         return
     rc = daemon.poll()
     if rc == None:


@@ -339,6 +339,7 @@ def run(module=None, report=True):
         failures += 1
     finally:
         stop_daemon()
         failures += 1
     finally:
         stop_daemon()

+        os.system("ps -ef | grep disorderd")

     if report:
         if failures:
             print " FAILED"
     if report:
         if failures:
             print " FAILED"