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_string.py b/Lib/test/test_string.py
index 918207a..859dd4e 100644
--- a/Lib/test/test_string.py
+++ b/Lib/test/test_string.py
@@ -95,10 +95,7 @@
self.assertEqual(string.capwords('ABC-def DEF-ghi GHI'), 'Abc-def Def-ghi Ghi')
def test_main():
- suite = unittest.TestSuite()
- suite.addTest(unittest.makeSuite(StringTest))
- suite.addTest(unittest.makeSuite(ModuleTest))
- test_support.run_suite(suite)
+ test_support.run_unittest(StringTest, ModuleTest)
if __name__ == "__main__":
test_main()