mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #21112: Fix regression in unittest.expectedFailure on subclasses.

Browse source 
Patch from Berker Peksag.
This commit is contained in:
Robert Collins 2015-08-28 10:34:51 +12:00
parent 5e580da0b6
commit ed599b7c84
3 changed files with 41 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Lib/unittest/case.py
View file

@ -563,8 +563,11 @@ class TestCase(object):
finally:
result.stopTest(self)
return
expecting_failure = getattr(testMethod,
"__unittest_expecting_failure__", False)
expecting_failure_method = getattr(testMethod,
"__unittest_expecting_failure__", False)
expecting_failure_class = getattr(self,
"__unittest_expecting_failure__", False)
expecting_failure = expecting_failure_class or expecting_failure_method
outcome = _Outcome(result)
try:
self._outcome = outcome