diff options
| author | Robert Collins <rbtcollins@hp.com> | 2015-08-27 22:35:14 (GMT) |
|---|---|---|
| committer | Robert Collins <rbtcollins@hp.com> | 2015-08-27 22:35:14 (GMT) |
| commit | 079fc7faff3cee1c68aee3ce0ca2c4ee18b72aab (patch) | |
| tree | b783d684fd15a3cf643244321fe14b1978b704aa /Lib/unittest/case.py | |
| parent | dcc47c6064cfa7b44a13853f14e4819185c8f2a2 (diff) | |
| parent | ed599b7c84ee216866f4f8a69b5f25dbc5cb4618 (diff) | |
| download | cpython-079fc7faff3cee1c68aee3ce0ca2c4ee18b72aab.zip cpython-079fc7faff3cee1c68aee3ce0ca2c4ee18b72aab.tar.gz cpython-079fc7faff3cee1c68aee3ce0ca2c4ee18b72aab.tar.bz2 | |
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 a4a0a1f..ac8d67d 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 |