mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-29 06:05:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Rename TestCase._result to _resultForDoCleanups to avoid potential clashes in TestCase subclasses. Issue 6072.

Browse source
This commit is contained in:
Michael Foord 2009-05-21 22:57:02 +00:00
parent a4e0efa4b1
commit a50af06931
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/test/test_unittest.py
View file

@ -3203,7 +3203,7 @@ class TestCleanUp(TestCase):
result = MockResult() result = MockResult()
test = TestableTest('testNothing') test = TestableTest('testNothing')
test._result = result test._resultForDoCleanups = result
exc1 = Exception('foo') exc1 = Exception('foo')
exc2 = Exception('bar') exc2 = Exception('bar')

6
Lib/unittest.py
View file

@ -352,7 +352,7 @@ class TestCase(object):
not have a method with the specified name. not have a method with the specified name.
""" """
self._testMethodName = methodName self._testMethodName = methodName
self._result = None self._resultForDoCleanups = None
try: try:
testMethod = getattr(self, methodName) testMethod = getattr(self, methodName)
except AttributeError: except AttributeError:
@ -456,7 +456,7 @@ class TestCase(object):
if startTestRun is not None: if startTestRun is not None:
startTestRun() startTestRun()
self._result = result self._resultForDoCleanups = result
result.startTest(self) result.startTest(self)
testMethod = getattr(self, self._testMethodName) testMethod = getattr(self, self._testMethodName)
try: try:
@ -503,7 +503,7 @@ class TestCase(object):
def doCleanups(self): def doCleanups(self):
"""Execute all cleanup functions. Normally called for you after """Execute all cleanup functions. Normally called for you after
tearDown.""" tearDown."""
result = self._result result = self._resultForDoCleanups
ok = True ok = True
while self._cleanups: while self._cleanups:
function, args, kwargs = self._cleanups.pop(-1) function, args, kwargs = self._cleanups.pop(-1)