server: docs: remove deprecated configuration and user upgrade.

[disorder] / tests / dtest.py

diff --git a/tests/dtest.py b/tests/dtest.py
index f17cf8e1af5a665f08ddb4cacf885bd53c26f096..74a7eb867a12365fcaa383e5bf8d61404cab6c18 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
     """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


@@ -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:


@@ -337,7 +337,9 @@ def run(module=None, report=True):
     except Exception, e:
         traceback.print_exc(None, sys.stderr)
         failures += 1
     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"
     if report:
         if failures:
             print " FAILED"