mirror of https://github.com/python/cpython
Rename TestCase._result to _resultForDoCleanups to avoid potential clashes in TestCase subclasses. Issue 6072.
This commit is contained in:
parent
a4e0efa4b1
commit
a50af06931
|
@ -3203,7 +3203,7 @@ class TestCleanUp(TestCase):
|
|||
|
||||
result = MockResult()
|
||||
test = TestableTest('testNothing')
|
||||
test._result = result
|
||||
test._resultForDoCleanups = result
|
||||
|
||||
exc1 = Exception('foo')
|
||||
exc2 = Exception('bar')
|
||||
|
|
|
@ -352,7 +352,7 @@ class TestCase(object):
|
|||
not have a method with the specified name.
|
||||
"""
|
||||
self._testMethodName = methodName
|
||||
self._result = None
|
||||
self._resultForDoCleanups = None
|
||||
try:
|
||||
testMethod = getattr(self, methodName)
|
||||
except AttributeError:
|
||||
|
@ -456,7 +456,7 @@ class TestCase(object):
|
|||
if startTestRun is not None:
|
||||
startTestRun()
|
||||
|
||||
self._result = result
|
||||
self._resultForDoCleanups = result
|
||||
result.startTest(self)
|
||||
testMethod = getattr(self, self._testMethodName)
|
||||
try:
|
||||
|
@ -503,7 +503,7 @@ class TestCase(object):
|
|||
def doCleanups(self):
|
||||
"""Execute all cleanup functions. Normally called for you after
|
||||
tearDown."""
|
||||
result = self._result
|
||||
result = self._resultForDoCleanups
|
||||
ok = True
|
||||
while self._cleanups:
|
||||
function, args, kwargs = self._cleanups.pop(-1)
|
||||
|
|
Loading…
Reference in New Issue