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_bz2.py b/Lib/test/test_bz2.py
index 64ce6ab..5280ba8 100644
--- a/Lib/test/test_bz2.py
+++ b/Lib/test/test_bz2.py
@@ -309,13 +309,12 @@
self.assertRaises(ValueError, bz2.decompress, self.DATA[:-10])
def test_main():
- suite = unittest.TestSuite()
- for test in (BZ2FileTest,
- BZ2CompressorTest,
- BZ2DecompressorTest,
- FuncTest):
- suite.addTest(unittest.makeSuite(test))
- test_support.run_suite(suite)
+ test_support.run_unittest(
+ BZ2FileTest,
+ BZ2CompressorTest,
+ BZ2DecompressorTest,
+ FuncTest
+ )
if __name__ == '__main__':
test_main()