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

Fixed #22130 -- fixed template_tests/defaultfilters order dependent test failure

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