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_timeout.py b/Lib/test/test_timeout.py
index d68484e..c0e1b13 100644
--- a/Lib/test/test_timeout.py
+++ b/Lib/test/test_timeout.py
@@ -186,10 +186,7 @@
def test_main():
test_support.requires('network')
-
- suite = unittest.makeSuite(CreationTestCase)
- suite.addTest(unittest.makeSuite(TimeoutTestCase))
- test_support.run_suite(suite)
+ test_support.run_unittest(CreationTestCase, TimeoutTestCase)
if __name__ == "__main__":
test_main()