(original) (raw)

changeset: 88218:b668c409c10a user: Antoine Pitrou solipsis@pitrou.net date: Sat Dec 28 20:37:58 2013 +0100 files: Lib/unittest/suite.py Lib/unittest/test/test_suite.py Misc/NEWS description: Fix breakage in TestSuite.countTestCases() introduced by issue #11798. diff -r 763f4416c4fd -r b668c409c10a Lib/unittest/suite.py --- a/Lib/unittest/suite.py Sat Dec 28 19:49:04 2013 +0100 +++ b/Lib/unittest/suite.py Sat Dec 28 20:37:58 2013 +0100 @@ -20,6 +20,7 @@ def __init__(self, tests=()): self._tests = [] + self._removed_tests = 0 self.addTests(tests) def __repr__(self): @@ -37,9 +38,10 @@ return iter(self._tests) def countTestCases(self): - cases = 0 + cases = self._removed_tests for test in self: - cases += test.countTestCases() + if test: + cases += test.countTestCases() return cases def addTest(self, test): @@ -70,10 +72,16 @@ def _removeTestAtIndex(self, index): """Stop holding a reference to the TestCase at index.""" try: - self._tests[index] = None + test = self._tests[index] except TypeError: - # support for suite implementations that have overriden self._test + # support for suite implementations that have overriden self._tests pass + else: + # Some unittest tests add non TestCase/TestSuite objects to + # the suite. + if hasattr(test, 'countTestCases'): + self._removed_tests += test.countTestCases() + self._tests[index] = None def __call__(self, *args, **kwds): return self.run(*args, **kwds) diff -r 763f4416c4fd -r b668c409c10a Lib/unittest/test/test_suite.py --- a/Lib/unittest/test/test_suite.py Sat Dec 28 19:49:04 2013 +0100 +++ b/Lib/unittest/test/test_suite.py Sat Dec 28 20:37:58 2013 +0100 @@ -51,6 +51,9 @@ 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])" # ... @@ -63,6 +66,9 @@ 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])" # ... @@ -84,6 +90,14 @@ 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 @@ -99,6 +113,9 @@ 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__ @@ -145,6 +162,9 @@ 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 @@ -162,6 +182,10 @@ 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." @@ -220,6 +244,9 @@ 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): @@ -233,6 +260,9 @@ 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." @@ -392,6 +422,7 @@ 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): diff -r 763f4416c4fd -r b668c409c10a Misc/NEWS --- a/Misc/NEWS Sat Dec 28 19:49:04 2013 +0100 +++ b/Misc/NEWS Sat Dec 28 20:37:58 2013 +0100 @@ -44,6 +44,8 @@ Library ------- +- Fix breakage in TestSuite.countTestCases() introduced by issue #11798. + - Issue #19918: Fix PurePath.relative_to() under Windows. - Issue #19422: Explicitly disallow non-SOCK_STREAM sockets in the ssl /solipsis@pitrou.net