Merge more 3.0 branch changes

[disorder] / tests / alltests

diff --git a/tests/alltests b/tests/alltests
index 4e3f64da1a200e3838a164a78b7394dc90788fd8..812b53a2404533d35d9ad7e834e8a6cac1dc11e4 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
@@ -54,12 +56,8 @@ for f in os.listdir(testdir):
 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)
+    print "-------- Test '%s' --------" % test
+    dtest.run(test, report=False)
 
 print "%d tests" % dtest.tests
 if dtest.failures: