fix support for non-doctest test cases

1 files changed, 19 insertions, 13 deletions

diff --git a/tests/runalltests.py b/tests/runalltests.py
index 5c438ff..c60cf1c 100755
--- a/tests/runalltests.py
+++ b/tests/runalltests.py
@@ -8,6 +8,7 @@
 import doctest
 import logging
 import os
+import os.path
 import shutil
 import signal
 import subprocess
@@ -63,27 +64,33 @@ def cleanup():
 def test_suite(tests=None):
     suite = unittest.TestSuite()
     if not tests:
-        tests = DOCTESTS
+        test_dir = os.path.dirname(__file__)
+        tests = [name for name in os.listdir(test_dir)
+            if name.startswith('test') and name.endswith('.py')]
+
+        tests += DOCTESTS
 
     for test in tests:
-        suite.addTest(doctest.DocFileSuite(test, optionflags=DOCTEST_OPTIONS))
+        if test.endswith('.txt'):
+            suite.addTest(doctest.DocFileSuite(test,
+                optionflags=DOCTEST_OPTIONS))
 
-    if len(sys.argv) <= 1:
-        tests = os.listdir(os.curdir)
-        tests = [n[:-3] for n in tests if n.startswith('test') and
-                 n.endswith('.py')]
+        elif test.endswith('.py'):
+            m = __import__(test[:-3])
+            if hasattr(m, 'suite'):
+                suite.addTest(m.suite())
 
-        for test in tests:
-            module = __import__(test)
-            if hasattr(module, 'test_suite'):
-                suite.addTest(module.test_suite())
     return suite
 
 
 def run_tests(tests):
     runner = unittest.TextTestRunner(verbosity=1)
     suite = test_suite(tests)
-    runner.run(suite)
+    result = runner.run(suite)
+    if result.wasSuccessful():
+        return 0
+    else:
+        return 10
 
 
 def main(my_name, arguments):
@@ -99,8 +106,7 @@ def main(my_name, arguments):
             cleanup()
 
     else:
-        run_tests(arguments[1:])
-        return 0
+        return run_tests(arguments[1:])
 
 
 if __name__ == "__main__":