diff options
Diffstat (limited to 'Lib/unittest/test/test_suite.py')
| -rw-r--r-- | Lib/unittest/test/test_suite.py | 94 |
1 files changed, 7 insertions, 87 deletions
diff --git a/Lib/unittest/test/test_suite.py b/Lib/unittest/test/test_suite.py index 0551a16..65b5b14 100644 --- a/Lib/unittest/test/test_suite.py +++ b/Lib/unittest/test/test_suite.py @@ -1,8 +1,6 @@ import unittest -import gc import sys -import weakref from unittest.test.support import LoggingResult, TestEquality @@ -28,15 +26,15 @@ class Test_TestSuite(unittest.TestCase, TestEquality): ################################################################ # Used by TestEquality.test_eq - eq_pairs = [(unittest.TestSuite(), unittest.TestSuite()) - ,(unittest.TestSuite(), unittest.TestSuite([])) - ,(_mk_TestSuite('test_1'), _mk_TestSuite('test_1'))] + eq_pairs = [(unittest.TestSuite(), unittest.TestSuite()), + (unittest.TestSuite(), unittest.TestSuite([])), + (_mk_TestSuite('test_1'), _mk_TestSuite('test_1'))] # Used by TestEquality.test_ne - ne_pairs = [(unittest.TestSuite(), _mk_TestSuite('test_1')) - ,(unittest.TestSuite([]), _mk_TestSuite('test_1')) - ,(_mk_TestSuite('test_1', 'test_2'), _mk_TestSuite('test_1', 'test_3')) - ,(_mk_TestSuite('test_1'), _mk_TestSuite('test_2'))] + ne_pairs = [(unittest.TestSuite(), _mk_TestSuite('test_1')), + (unittest.TestSuite([]), _mk_TestSuite('test_1')), + (_mk_TestSuite('test_1', 'test_2'), _mk_TestSuite('test_1', 'test_3')), + (_mk_TestSuite('test_1'), _mk_TestSuite('test_2'))] ################################################################ ### /Set up attributes needed by inherited tests @@ -51,9 +49,6 @@ class Test_TestSuite(unittest.TestCase, TestEquality): suite = unittest.TestSuite() self.assertEqual(suite.countTestCases(), 0) - # countTestCases() still works after tests are run - suite.run(unittest.TestResult()) - self.assertEqual(suite.countTestCases(), 0) # "class TestSuite([tests])" # ... @@ -66,9 +61,6 @@ class Test_TestSuite(unittest.TestCase, TestEquality): suite = unittest.TestSuite([]) self.assertEqual(suite.countTestCases(), 0) - # countTestCases() still works after tests are run - suite.run(unittest.TestResult()) - self.assertEqual(suite.countTestCases(), 0) # "class TestSuite([tests])" # ... @@ -90,14 +82,6 @@ class Test_TestSuite(unittest.TestCase, TestEquality): suite_3 = unittest.TestSuite(set(suite_1)) self.assertEqual(suite_3.countTestCases(), 2) - # countTestCases() still works after tests are run - suite_1.run(unittest.TestResult()) - self.assertEqual(suite_1.countTestCases(), 2) - suite_2.run(unittest.TestResult()) - self.assertEqual(suite_2.countTestCases(), 2) - suite_3.run(unittest.TestResult()) - self.assertEqual(suite_3.countTestCases(), 2) - # "class TestSuite([tests])" # ... # "If tests is given, it must be an iterable of individual test cases @@ -113,9 +97,6 @@ class Test_TestSuite(unittest.TestCase, TestEquality): suite = unittest.TestSuite(tests()) self.assertEqual(suite.countTestCases(), 2) - # countTestCases() still works after tests are run - suite.run(unittest.TestResult()) - self.assertEqual(suite.countTestCases(), 2) ################################################################ ### /Tests for TestSuite.__init__ @@ -162,9 +143,6 @@ class Test_TestSuite(unittest.TestCase, TestEquality): suite = unittest.TestSuite((test1, test2)) self.assertEqual(suite.countTestCases(), 2) - # countTestCases() still works after tests are run - suite.run(unittest.TestResult()) - self.assertEqual(suite.countTestCases(), 2) # "Return the number of tests represented by the this test object. # ...this method is also implemented by the TestSuite class, which can @@ -182,10 +160,6 @@ class Test_TestSuite(unittest.TestCase, TestEquality): parent = unittest.TestSuite((test3, child, Test1('test1'))) self.assertEqual(parent.countTestCases(), 4) - # countTestCases() still works after tests are run - parent.run(unittest.TestResult()) - self.assertEqual(parent.countTestCases(), 4) - self.assertEqual(child.countTestCases(), 2) # "Run the tests associated with this suite, collecting the result into # the test result object passed as result." @@ -244,9 +218,6 @@ class Test_TestSuite(unittest.TestCase, TestEquality): self.assertEqual(suite.countTestCases(), 1) self.assertEqual(list(suite), [test]) - # countTestCases() still works after tests are run - suite.run(unittest.TestResult()) - self.assertEqual(suite.countTestCases(), 1) # "Add a ... TestSuite to the suite" def test_addTest__TestSuite(self): @@ -260,9 +231,6 @@ class Test_TestSuite(unittest.TestCase, TestEquality): self.assertEqual(suite.countTestCases(), 1) self.assertEqual(list(suite), [suite_2]) - # countTestCases() still works after tests are run - suite.run(unittest.TestResult()) - self.assertEqual(suite.countTestCases(), 1) # "Add all the tests from an iterable of TestCase and TestSuite # instances to this test suite." @@ -332,54 +300,7 @@ class Test_TestSuite(unittest.TestCase, TestEquality): # when the bug is fixed this line will not crash suite.run(unittest.TestResult()) - def test_remove_test_at_index(self): - if not unittest.BaseTestSuite._cleanup: - raise unittest.SkipTest("Suite cleanup is disabled") - - suite = unittest.TestSuite() - suite._tests = [1, 2, 3] - suite._removeTestAtIndex(1) - - self.assertEqual([1, None, 3], suite._tests) - - def test_remove_test_at_index_not_indexable(self): - if not unittest.BaseTestSuite._cleanup: - raise unittest.SkipTest("Suite cleanup is disabled") - - suite = unittest.TestSuite() - suite._tests = None - - # if _removeAtIndex raises for noniterables this next line will break - suite._removeTestAtIndex(2) - - def assert_garbage_collect_test_after_run(self, TestSuiteClass): - if not unittest.BaseTestSuite._cleanup: - raise unittest.SkipTest("Suite cleanup is disabled") - - class Foo(unittest.TestCase): - def test_nothing(self): - pass - - test = Foo('test_nothing') - wref = weakref.ref(test) - - suite = TestSuiteClass([wref()]) - suite.run(unittest.TestResult()) - - del test - - # for the benefit of non-reference counting implementations - gc.collect() - - self.assertEqual(suite._tests, [None]) - self.assertIsNone(wref()) - - def test_garbage_collect_test_after_run_BaseTestSuite(self): - self.assert_garbage_collect_test_after_run(unittest.BaseTestSuite) - - def test_garbage_collect_test_after_run_TestSuite(self): - self.assert_garbage_collect_test_after_run(unittest.TestSuite) def test_basetestsuite(self): class Test(unittest.TestCase): @@ -422,7 +343,6 @@ class Test_TestSuite(unittest.TestCase, TestEquality): self.assertEqual(len(result.errors), 1) self.assertEqual(len(result.failures), 0) self.assertEqual(result.testsRun, 2) - self.assertEqual(suite.countTestCases(), 2) def test_overriding_call(self): |