diff options
| author | Robert Collins <rbtcollins@hp.com> | 2015-08-27 22:34:51 (GMT) |
|---|---|---|
| committer | Robert Collins <rbtcollins@hp.com> | 2015-08-27 22:34:51 (GMT) |
| commit | ed599b7c84ee216866f4f8a69b5f25dbc5cb4618 (patch) | |
| tree | ecdcb5c10d9e5b4d387dc354ddeed395653a2601 /Lib/unittest/case.py | |
| parent | 5e580da0b6a75c3cafecb0306c3f166d1e5d3edc (diff) | |
| download | cpython-ed599b7c84ee216866f4f8a69b5f25dbc5cb4618.zip cpython-ed599b7c84ee216866f4f8a69b5f25dbc5cb4618.tar.gz cpython-ed599b7c84ee216866f4f8a69b5f25dbc5cb4618.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 69888a5..8a9f1c0 100644 --- a/Lib/unittest/case.py +++ b/Lib/unittest/case.py @@ -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 |