summaryrefslogtreecommitdiff
path: root/tests/template_tests/syntax_tests/test_ssi.py
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2015-01-17 13:29:52 -0500
committerTim Graham <timograham@gmail.com>2015-01-17 13:29:52 -0500
commitbd93032191f96bc7086aa46b91b4177601c6fce9 (patch)
tree983458f8b8736c806962ee2c412ee8bfae741e32 /tests/template_tests/syntax_tests/test_ssi.py
parente278407b20af0fd957fc3f39244a991c7520f2ba (diff)
Removed ssi/url tags from future per deprecation timeline; refs #21939.
Diffstat (limited to 'tests/template_tests/syntax_tests/test_ssi.py')
-rw-r--r--tests/template_tests/syntax_tests/test_ssi.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/tests/template_tests/syntax_tests/test_ssi.py b/tests/template_tests/syntax_tests/test_ssi.py
index b87c1f9c2c..c971f5c32c 100644
--- a/tests/template_tests/syntax_tests/test_ssi.py
+++ b/tests/template_tests/syntax_tests/test_ssi.py
@@ -1,7 +1,7 @@
import os
from django.test import ignore_warnings, SimpleTestCase
-from django.utils.deprecation import RemovedInDjango19Warning, RemovedInDjango20Warning
+from django.utils.deprecation import RemovedInDjango20Warning
from ..utils import ROOT, setup
@@ -32,16 +32,14 @@ class SsiTagTests(SimpleTestCase):
self.assertEqual(output, ''),
# Test passing as a variable
- @ignore_warnings(category=RemovedInDjango19Warning)
- @setup({'ssi04': '{% load ssi from future %}{% ssi ssi_file %}'})
+ @setup({'ssi04': '{% ssi ssi_file %}'})
def test_ssi04(self):
output = self.engine.render_to_string('ssi04', {
'ssi_file': os.path.join(ROOT, 'templates', 'ssi_include.html')
})
self.assertEqual(output, 'This is for testing an ssi include. {{ test }}\n')
- @ignore_warnings(category=RemovedInDjango19Warning)
- @setup({'ssi05': '{% load ssi from future %}{% ssi ssi_file %}'})
+ @setup({'ssi05': '{% ssi ssi_file %}'})
def test_ssi05(self):
output = self.engine.render_to_string('ssi05', {'ssi_file': 'no_file'})
self.assertEqual(output, '')