diff options
| author | Aymeric Augustin <aymeric.augustin@m4x.org> | 2015-09-10 18:05:15 +0200 |
|---|---|---|
| committer | Aymeric Augustin <aymeric.augustin@m4x.org> | 2015-09-10 18:21:13 +0200 |
| commit | 968b02f8f0f5170d6ec69bca9d92b2c281417782 (patch) | |
| tree | d5854d99eade99b3da55216aebd1bad0adc566a7 | |
| parent | c97b755a1cdd7051270de6ac2605a8a1e87555fb (diff) | |
Refs #20461 -- Made tblib optional for a passing test run.
This was the original intent.
| -rw-r--r-- | django/test/runner.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/django/test/runner.py b/django/test/runner.py index 8b4e328543..487f61827b 100644 --- a/django/test/runner.py +++ b/django/test/runner.py @@ -171,7 +171,14 @@ failure and get a correct traceback. self.events.append(('addSkip', self.test_index, reason)) def addExpectedFailure(self, test, err): - self.check_pickleable(test, err) + # If tblib isn't installed, pickling the traceback will always fail. + # However we don't want tblib to be required for running the tests + # when they pass or fail as expected. Drop the traceback when an + # expected failure occurs. + if tblib is None: + err = err[0], err[1], None + else: + self.check_pickleable(test, err) self.events.append(('addExpectedFailure', self.test_index, err)) def addUnexpectedSuccess(self, test): |
