Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merged revisions 81878 via svnmerge from 

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81878 | michael.foord | 2010-06-10 21:40:21 +0100 (Thu, 10 Jun 2010) | 2 lines

  Fix issue with nested test suites debug method and module setups. (unittest)
........
This commit is contained in:
Michael Foord 2010-06-10 20:41:54 +00:00
parent d8efa020d8
commit 2b293cf1a5
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/unittest/suite.py
View File

@ -109,7 +109,7 @@ class TestSuite(BaseTestSuite):
continue
if hasattr(test, '_wrapped_run'):
test._wrapped_run(result)
test._wrapped_run(result, debug)
elif not debug:
test(result)
else:

4
Lib/unittest/test/test_setups.py
View File

@ -494,7 +494,9 @@ class TestSetups(unittest.TestCase):
Test.__module__ = 'Module'
sys.modules['Module'] = Module
suite = unittest.defaultTestLoader.loadTestsFromTestCase(Test)
_suite = unittest.defaultTestLoader.loadTestsFromTestCase(Test)
suite = unittest.TestSuite()
suite.addTest(_suite)
messages = ('setUpModule', 'tearDownModule', 'setUpClass', 'tearDownClass', 'test_something')
for phase, msg in enumerate(messages):