borrow some test naming conventions from disorder.unicode

[disorder] / tests / dtest.py

diff --git a/tests/dtest.py b/tests/dtest.py
index 552542ae6fbb2ea80546c7492c799588a091c789..11b6e8bafe40ad161478808f2cc96db8a5dcc5c5 100644 (file)
--- a/tests/dtest.py
+++ b/tests/dtest.py
@@ -105,8 +105,8 @@ def stdtracks():
 def notracks():
     pass
 
 def notracks():
     pass
 

-def start():
-    """start()
+def start_daemon():
+    """start_daemon()

 
 Start the daemon."""
     global daemon
 
 Start the daemon."""
     global daemon


@@ -119,8 +119,8 @@ Start the daemon."""
     disorder._configfile = "%s/config" % testroot
     disorder._userconf = False
 
     disorder._configfile = "%s/config" % testroot
     disorder._userconf = False
 

-def stop():
-    """stop()
+def stop_daemon():
+    """stop_daemon()

 
 Stop the daemon if it has not stopped already"""
     global daemon
 
 Stop the daemon if it has not stopped already"""
     global daemon


@@ -163,7 +163,7 @@ def run(module=None, report=True):
             failures += 1
             print e
     finally:
             failures += 1
             print e
     finally:

-        stop()
+        stop_daemon()

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