diff options
| author | Tim Graham <timograham@gmail.com> | 2015-05-09 19:13:05 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2015-06-09 17:54:33 -0400 |
| commit | 8bc18ebf0fc7d82dda266812a1920d179c54223c (patch) | |
| tree | cf7397d46b1bdbfa3eca989bfa4f06b39eedd7b3 /tests | |
| parent | b3f61f6e0840473cfd9485b95752aba572e9a9c9 (diff) | |
[1.8.x] Fixed #24903 -- Fixed assertRaisesMessage on Python 2.7.10.
A regression in Python 2.7.10 rc1 wasn't reverted in the final
release: https://bugs.python.org/issue24134
Backport of two commits from master:
* c2bc1cefdcbbf074408f4a4cace88b315cf9d652
* e89c3a46035e9fe17c373a6c9cd63b9fd631d596
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test_utils/tests.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/test_utils/tests.py b/tests/test_utils/tests.py index 9c6861393a..1c5c12ca5b 100644 --- a/tests/test_utils/tests.py +++ b/tests/test_utils/tests.py @@ -752,6 +752,12 @@ class AssertRaisesMsgTest(SimpleTestCase): raise ValueError("[.*x+]y?") self.assertRaisesMessage(ValueError, "[.*x+]y?", func1) + def test_callable_obj_param(self): + # callable_obj was a documented kwarg in older version of Django. + def func1(): + raise ValueError("[.*x+]y?") + self.assertRaisesMessage(ValueError, "[.*x+]y?", callable_obj=func1) + class AssertFieldOutputTests(SimpleTestCase): |