"alltests" runners call testbase.main(), which takes an optional suite,

so that exit code is propigated

diff --git a/test/alltests.py b/test/alltests.py
index c60e73641d52449c3b141970444ee0499f4dbada..3fbace0160833bfcfa86af50a9bcd1adacbaff38 100644 (file)
--- a/test/alltests.py
+++ b/test/alltests.py
@@ -16,4 +16,4 @@ def suite():
 
 
 if __name__ == '__main__':
-    testbase.runTests(suite())
+    testbase.main(suite())

diff --git a/test/base/alltests.py b/test/base/alltests.py
index 887e4567cc9cb85ab865da2e760c3d716a5aefb7..70ff83ab8a930e2188938f42e4443dcf8da03e2f 100644 (file)
--- a/test/base/alltests.py
+++ b/test/base/alltests.py
@@ -16,4 +16,4 @@ def suite():
 
 
 if __name__ == '__main__':
-    testbase.runTests(suite())
+    testbase.main(suite())

diff --git a/test/engine/alltests.py b/test/engine/alltests.py
index 7bb9acb72fa443195543b0cfc2bd3e117a8ae5d0..8110396b31e739c783c1b3629692e479febef65f 100644 (file)
--- a/test/engine/alltests.py
+++ b/test/engine/alltests.py
@@ -26,4 +26,4 @@ def suite():
 
 
 if __name__ == '__main__':
-    testbase.runTests(suite())
+    testbase.main(suite())

diff --git a/test/ext/alltests.py b/test/ext/alltests.py
index e13f5472f98b1a6ba7f1dbd35d9f592a7e8494fc..a056776dc38cc022150579f492c1a0558969a8fc 100644 (file)
--- a/test/ext/alltests.py
+++ b/test/ext/alltests.py
@@ -17,4 +17,4 @@ def suite():
 
 
 if __name__ == '__main__':
-    testbase.runTests(suite())
+    testbase.main(suite())

diff --git a/test/orm/alltests.py b/test/orm/alltests.py
index c30bc140641e879e32aafcbca1facef2269c3d18..46eeb3ce92b374cc72d310e6fc75fa791dc94255 100644 (file)
--- a/test/orm/alltests.py
+++ b/test/orm/alltests.py
@@ -46,4 +46,4 @@ def suite():
 
 
 if __name__ == '__main__':
-    testbase.runTests(suite())
+    testbase.main(suite())

diff --git a/test/sql/alltests.py b/test/sql/alltests.py
index 98dbfa6a079b02be93c2eaa0d6c23e64431975a6..2517cdf8d2041a124145c9de3e10584928cde0fb 100644 (file)
--- a/test/sql/alltests.py
+++ b/test/sql/alltests.py
@@ -31,4 +31,4 @@ def suite():
 
 
 if __name__ == '__main__':
-    testbase.runTests(suite())
+    testbase.main(suite())

diff --git a/test/testbase.py b/test/testbase.py
index 47ddaec8bca2b76dac7bafbd02dea896e5f44b48..34c05b8e5002277cff49a71f2b328a025a23d930 100644 (file)
--- a/test/testbase.py
+++ b/test/testbase.py
@@ -407,12 +407,13 @@ def cover(callable_):
         coverage_client.save()
         coverage_client.report(list(covered_files()), show_missing=False, ignore_errors=False)
 
-def main():
+def main(suite=None):
     
-    if len(sys.argv[1:]):
-        suite =unittest.TestLoader().loadTestsFromNames(sys.argv[1:], __import__('__main__'))
-    else:
-        suite = unittest.TestLoader().loadTestsFromModule(__import__('__main__'))
+    if not suite:
+        if len(sys.argv[1:]):
+            suite =unittest.TestLoader().loadTestsFromNames(sys.argv[1:], __import__('__main__'))
+        else:
+            suite = unittest.TestLoader().loadTestsFromModule(__import__('__main__'))
 
     result = runTests(suite)
     sys.exit(not result.wasSuccessful())

diff --git a/test/zblog/alltests.py b/test/zblog/alltests.py
index 9368eb8207aaec0b86454c045b31d1de5a2bb957..ed430ac7ee5d2ec88074992bcd6011d78603a390 100644 (file)
--- a/test/zblog/alltests.py
+++ b/test/zblog/alltests.py
@@ -15,4 +15,4 @@ def suite():
 
 
 if __name__ == '__main__':
-    testbase.runTests(suite())
+    testbase.main(suite())