Combine the functionality of test_support.run_unittest()
and test_support.run_classtests() into run_unittest()
and use it wherever possible.
Also don't use "from test.test_support import ...", but
"from test import test_support" in a few spots.
From SF patch #662807.
diff --git a/Lib/test/test_support.py b/Lib/test/test_support.py
index 56b60cc..906ed8a 100644
--- a/Lib/test/test_support.py
+++ b/Lib/test/test_support.py
@@ -229,15 +229,16 @@
raise TestFailed(err)
-def run_unittest(testclass):
- """Run tests from a unittest.TestCase-derived class."""
- run_suite(unittest.makeSuite(testclass), testclass)
-
-def run_classtests(*classnames):
+def run_unittest(*classes):
+ """Run tests from unittest.TestCase-derived classes."""
suite = unittest.TestSuite()
- for cls in classnames:
+ for cls in classes:
suite.addTest(unittest.makeSuite(cls))
- run_suite(suite)
+ if len(classes)==1:
+ testclass = classes[0]
+ else:
+ testclass = None
+ run_suite(suite, testclass)
#=======================================================================