p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #2383 from erikr/fix-tests-fix-ampersands-deprecation 

Fixed #22130 -- fixed template_tests/defaultfilters order dependent test failure
This commit is contained in:
Aymeric Augustin 2014-03-02 15:31:11 +01:00
parent 7ba29189fa 6268792e19
commit a08f906556
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/defaultfilters/tests.py
View File

@ -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'),