summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/template_tests/syntax_tests/test_for.py3
-rw-r--r--tests/view_tests/tests/test_csrf.py6
2 files changed, 1 insertions, 8 deletions
diff --git a/tests/template_tests/syntax_tests/test_for.py b/tests/template_tests/syntax_tests/test_for.py
index ff92c09369..03c2e6ee9b 100644
--- a/tests/template_tests/syntax_tests/test_for.py
+++ b/tests/template_tests/syntax_tests/test_for.py
@@ -126,9 +126,6 @@ class ForTagTests(SimpleTestCase):
output = self.engine.render_to_string('for-tag-filter-ws', {'s': 'abc'})
self.assertEqual(output, 'abc')
- # These tests raise deprecation warnings and will raise an exception
- # in Django 1.10. The existing behavior is silent truncation if the
- # length of loopvars differs to the length of each set of items.
@setup({'for-tag-unpack10': '{% for x,y in items %}{{ x }}:{{ y }}/{% endfor %}'})
def test_for_tag_unpack10(self):
with self.assertRaisesMessage(ValueError, 'Need 2 values to unpack in for loop; got 3.'):
diff --git a/tests/view_tests/tests/test_csrf.py b/tests/view_tests/tests/test_csrf.py
index 50104df989..f6531b882c 100644
--- a/tests/view_tests/tests/test_csrf.py
+++ b/tests/view_tests/tests/test_csrf.py
@@ -63,11 +63,7 @@ class CsrfViewTests(SimpleTestCase):
"by third parties.",
status_code=403)
- # In Django 1.10, this can be changed to TEMPLATES=[] because the code path
- # that reads the TEMPLATE_* settings in that case will have been removed.
- @override_settings(TEMPLATES=[{
- 'BACKEND': 'django.template.backends.dummy.TemplateStrings',
- }])
+ @override_settings(TEMPLATES=[])
def test_no_django_template_engine(self):
"""
The CSRF view doesn't depend on the TEMPLATES configuration (#24388).