sync with trunk

[disorder] / tests / version.py

diff --git a/tests/version.py b/tests/version.py
index 760a65ce3a0bc8483ab265bdced367fd8c98f605..9ec922c014357f02b0967c51585f86201a7fb680 100755 (executable)
--- a/tests/version.py
+++ b/tests/version.py
@@ -22,10 +22,10 @@ import dtest,time,disorder
 
 def test():
     """Ask the server its version number"""
-    time.sleep(2)                       # give the daemon a chance to start up
+    dtest.start_daemon()
     c = disorder.client()
     v = c.version()
     print "Server version: %s" % v
 
 if __name__ == '__main__':
-    dtest.run(test)
+    dtest.run()