diff options
| author | Aymeric Augustin <aymeric.augustin@m4x.org> | 2014-03-02 15:31:11 +0100 |
|---|---|---|
| committer | Aymeric Augustin <aymeric.augustin@m4x.org> | 2014-03-02 15:31:11 +0100 |
| commit | a08f906556c14357852bbc9c4c7d10c6558dafcf (patch) | |
| tree | 1a050a27afa518601a20af242c0bcbaed44e3381 | |
| parent | 7ba29189fabccdfde34071846bc08252588554d7 (diff) | |
| parent | 6268792e19ab37446e438f4777c0bb8e786c5c3f (diff) | |
Merge pull request #2383 from erikr/fix-tests-fix-ampersands-deprecation
Fixed #22130 -- fixed template_tests/defaultfilters order dependent test failure
| -rw-r--r-- | tests/defaultfilters/tests.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/defaultfilters/tests.py b/tests/defaultfilters/tests.py index 5ff31cc025..47381b7db7 100644 --- a/tests/defaultfilters/tests.py +++ b/tests/defaultfilters/tests.py @@ -125,11 +125,10 @@ class DefaultFiltersTests(TestCase): 'paragraph separator:\\u2029and line separator:\\u2028') def test_fix_ampersands(self): - with warnings.catch_warnings(record=True) as w: - warnings.simplefilter("always", DeprecationWarning) + with warnings.catch_warnings(): + warnings.simplefilter("ignore", DeprecationWarning) self.assertEqual(fix_ampersands_filter('Jack & Jill & Jeroboam'), 'Jack & Jill & Jeroboam') - self.assertEqual(len(w), 1) def test_linenumbers(self): self.assertEqual(linenumbers('line 1\nline 2'), |