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

Patch from Berker Peksag.
This commit is contained in:
Robert Collins 2015-08-28 10:35:14 +12:00
commit 079fc7faff
3 changed files with 41 additions and 2 deletions

View file

@ -583,8 +583,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