more test fiddling

diff --git a/.bzrignore b/.bzrignore
index f9d8ac1db223e40492cf079d2f597fec5a3c0a1d..230d66a7e63c7b6ec542643c5422025fe0656159 100644 (file)
--- a/.bzrignore
+++ b/.bzrignore
@@ -117,3 +117,4 @@ server/disorder-stats
 *.deb
 *.dsc
 disobedience/disobedience.html
+tests/*.log

diff --git a/tests/alltests b/tests/alltests
index 4e3f64da1a200e3838a164a78b7394dc90788fd8..b115f7d1e226c0c113e5858c30a83024f85873df 100755 (executable)
--- a/tests/alltests
+++ b/tests/alltests
@@ -40,6 +40,8 @@ import dtest
 # call dtest.run
 tests = []
 for f in os.listdir(testdir):
+    if f == 'dtest.py':                 # special case
+        continue
     r = re.search("^(.*)\\.py$", f)
     if r is not None:
         isTest = False
@@ -55,11 +57,7 @@ tests.sort()                            # let's have a consistent order
 
 for test in tests:
     print "Test '%s'" % test
-    m = __import__(test)
-    dtest.run(getattr(m, "test"),
-              setup=getattr(m, "setup", None),
-              report=False,
-              name=test)
+    dtest.run(test, report=False)
 
 print "%d tests" % dtest.tests
 if dtest.failures:

diff --git a/tests/dtest.py b/tests/dtest.py
index 937d83e017ca5288cf93e65c9bb69e9878b468f8..552542ae6fbb2ea80546c7492c799588a091c789 100644 (file)
--- a/tests/dtest.py
+++ b/tests/dtest.py
@@ -105,17 +105,12 @@ def stdtracks():
 def notracks():
     pass
 
-def start(test):
-    """start(TEST)
+def start():
+    """start()
 
-Start the daemon for test called TEST."""
+Start the daemon."""
     global daemon
     assert daemon == None
-    if test == None:
-        errs = sys.stderr
-    else:
-        errs = open("%s/%s.log" % (testroot, test), "w")
-    server = None
     print " starting daemon"
     daemon = subprocess.Popen(["disorderd",
                                "--foreground",
@@ -129,6 +124,8 @@ def stop():
 
 Stop the daemon if it has not stopped already"""
     global daemon
+    if daemon == None:
+        return
     rc = daemon.poll()
     if rc == None:
         print " stopping daemon"
@@ -137,16 +134,30 @@ Stop the daemon if it has not stopped already"""
     print " daemon has stopped"
     daemon = None
 
-def run(test, setup=None, report=True, name=None): 
+def run(module=None, report=True):
+    """dtest.run(MODULE)
+
+    Run the test in MODULE.  This can be a string (in which case the module
+    will be imported) or a module object."""
     global tests
     tests += 1
-    if setup == None:
-        setup = stdtracks
+    if module is None:
+        # We're running a test stand-alone
+        import __main__
+        module = __main__
+        name = os.path.splitext(os.path.basename(sys.argv[0]))[0]
+    else:
+        # We've been passed a module or a module name
+        if type(module) == str:
+            module = __import__(module)
+        name = module.__name__
+    global errs
+    errs = open("%s.log" % name, "w")
+    setup = stdtracks
     setup()
-    start(name)
     try:
         try:
-            test()
+            module.test()
         except AssertionError, e:
             global failures
             failures += 1

diff --git a/tests/nothing.py b/tests/nothing.py
index 34cc706eb8c5351c3e0391399a7f9377c19d7030..aeb0308f0b5efbf3f5f73212bb5a67daa1ccc0db 100755 (executable)
--- a/tests/nothing.py
+++ b/tests/nothing.py
@@ -22,7 +22,9 @@ import dtest,time
 
 def test():
     """Just start the server and then stop it a few seconds later"""
-    time.sleep(5)
+    dtest.start()
+    time.sleep(2)
+    dtest.stop()
 
 if __name__ == '__main__':
-    dtest.run(test)
+    dtest.run()

diff --git a/tests/version.py b/tests/version.py
index 760a65ce3a0bc8483ab265bdced367fd8c98f605..6fd42df99579c080f596c7a82df325a9a4234f68 100755 (executable)
--- a/tests/version.py
+++ b/tests/version.py
@@ -22,10 +22,12 @@ import dtest,time,disorder
 
 def test():
     """Ask the server its version number"""
+    dtest.start()
     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(test)
+    dtest.run()