borrow some test naming conventions from disorder.unicode

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"

diff --git a/tests/nothing.py b/tests/nothing.py
index aeb0308f0b5efbf3f5f73212bb5a67daa1ccc0db..f3bdeb94e777784c8390f5a59ff386db18d314f3 100755 (executable)
--- a/tests/nothing.py
+++ b/tests/nothing.py
@@ -22,9 +22,8 @@ import dtest,time
 
 def test():
     """Just start the server and then stop it a few seconds later"""
 
 def test():
     """Just start the server and then stop it a few seconds later"""

-    dtest.start()
+    dtest.start_daemon()

     time.sleep(2)
     time.sleep(2)

-    dtest.stop()

 
 if __name__ == '__main__':
     dtest.run()
 
 if __name__ == '__main__':
     dtest.run()

diff --git a/tests/version.py b/tests/version.py
index 6fd42df99579c080f596c7a82df325a9a4234f68..dbb0df62abbdeea18a987ee5756cc62618f8236e 100755 (executable)
--- a/tests/version.py
+++ b/tests/version.py
@@ -22,12 +22,11 @@ import dtest,time,disorder
 
 def test():
     """Ask the server its version number"""
 
 def test():
     """Ask the server its version number"""

-    dtest.start()
+    dtest.start_daemon()

     time.sleep(2)                       # give the daemon a chance to start up
     c = disorder.client()
     v = c.version()
     print "Server version: %s" % v
     time.sleep(2)                       # give the daemon a chance to start up
     c = disorder.client()
     v = c.version()
     print "Server version: %s" % v

-    dtest.stop()

 
 if __name__ == '__main__':
     dtest.run()
 
 if __name__ == '__main__':
     dtest.run()