diff options
| author | Robert Collins <rbtcollins@hp.com> | 2015-08-28 10:36:01 +1200 |
|---|---|---|
| committer | Robert Collins <rbtcollins@hp.com> | 2015-08-28 10:36:01 +1200 |
| commit | fd10a767a2a33aedc73de6eb6ff3dae96b35a540 (patch) | |
| tree | e2b91f4bef48ae9d842de8ac0717fae454ff8578 /Lib/unittest/case.py | |
| parent | a51ffd309925980704d252d5b5d9f2c954d8b8e1 (diff) | |
| parent | 079fc7faff3cee1c68aee3ce0ca2c4ee18b72aab (diff) | |
| download | cpython-git-fd10a767a2a33aedc73de6eb6ff3dae96b35a540.tar.gz | |
Issue #21112: Fix regression in unittest.expectedFailure on subclasses.
Patch from Berker Peksag.
Diffstat (limited to 'Lib/unittest/case.py')
| -rw-r--r-- | Lib/unittest/case.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Lib/unittest/case.py b/Lib/unittest/case.py index a4a0a1f31e..ac8d67ddd1 100644 --- a/Lib/unittest/case.py +++ b/Lib/unittest/case.py @@ -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 |