summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorPreston Timmons <prestontimmons@gmail.com>2015-01-05 14:43:15 -0600
committerTim Graham <timograham@gmail.com>2015-01-05 19:35:02 -0500
commitde9ebdd39cb4f4b65475b43e0e32772d5a315654 (patch)
treea1829e7865df451879a52f3dfda2affc18453809 /tests
parenta9aec1154e5b65fcaf608801905a1bbafcfbfbf7 (diff)
Fixed #24022 -- Deprecated the ssi tag.
Diffstat (limited to 'tests')
-rw-r--r--tests/template_tests/syntax_tests/test_ssi.py3
-rw-r--r--tests/template_tests/tests.py4
2 files changed, 5 insertions, 2 deletions
diff --git a/tests/template_tests/syntax_tests/test_ssi.py b/tests/template_tests/syntax_tests/test_ssi.py
index bc70aca9c6..b87c1f9c2c 100644
--- a/tests/template_tests/syntax_tests/test_ssi.py
+++ b/tests/template_tests/syntax_tests/test_ssi.py
@@ -1,11 +1,12 @@
import os
from django.test import ignore_warnings, SimpleTestCase
-from django.utils.deprecation import RemovedInDjango19Warning
+from django.utils.deprecation import RemovedInDjango19Warning, RemovedInDjango20Warning
from ..utils import ROOT, setup
+@ignore_warnings(category=RemovedInDjango20Warning)
class SsiTagTests(SimpleTestCase):
# Test normal behavior
diff --git a/tests/template_tests/tests.py b/tests/template_tests/tests.py
index 6712ad12b1..b404a83098 100644
--- a/tests/template_tests/tests.py
+++ b/tests/template_tests/tests.py
@@ -13,7 +13,8 @@ from django.template import (base as template_base, loader,
from django.template.engine import Engine
from django.template.loaders import app_directories, filesystem
from django.test import RequestFactory, SimpleTestCase
-from django.test.utils import override_settings, extend_sys_path
+from django.test.utils import extend_sys_path, ignore_warnings, override_settings
+from django.utils.deprecation import RemovedInDjango20Warning
from django.utils._os import upath
@@ -501,6 +502,7 @@ class RequestContextTests(unittest.TestCase):
RequestContext(request, dict_=test_data, engine=engine))
+@ignore_warnings(category=RemovedInDjango20Warning)
class SSITests(SimpleTestCase):
def setUp(self):
self.this_dir = os.path.dirname(os.path.abspath(upath(__file__)))