summaryrefslogtreecommitdiff
path: root/tests/test_client_regress
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2014-12-17 22:51:42 +0100
committerAymeric Augustin <aymeric.augustin@m4x.org>2014-12-28 17:02:30 +0100
commitd3205e3e2eb0202e7bdffaee3e2a80ad444b1ca2 (patch)
tree11cc72ef84a3c35a5736de34b01bd52106fce08f /tests/test_client_regress
parentcf0fd65ed42d5d4f0585da413db4b1cf7c6b0d1a (diff)
downloaddjango-d3205e3e2eb0202e7bdffaee3e2a80ad444b1ca2.tar.gz
Deprecated TEMPLATE_DIRS.
Diffstat (limited to 'tests/test_client_regress')
-rw-r--r--tests/test_client_regress/tests.py12
1 files changed, 5 insertions, 7 deletions
diff --git a/tests/test_client_regress/tests.py b/tests/test_client_regress/tests.py
index 8bd4ad44aa..9d263f70b6 100644
--- a/tests/test_client_regress/tests.py
+++ b/tests/test_client_regress/tests.py
@@ -25,10 +25,7 @@ from .models import CustomUser
from .views import CustomTestException
-@override_settings(
- TEMPLATE_DIRS=(os.path.join(os.path.dirname(upath(__file__)), 'templates'),),
- ROOT_URLCONF='test_client_regress.urls',
-)
+@override_settings(ROOT_URLCONF='test_client_regress.urls')
class AssertContainsTests(TestCase):
def test_contains(self):
@@ -911,9 +908,10 @@ class ExceptionTests(TestCase):
@override_settings(ROOT_URLCONF='test_client_regress.urls')
class TemplateExceptionTests(TestCase):
- @override_settings(
- TEMPLATE_DIRS=(os.path.join(os.path.dirname(upath(__file__)), 'bad_templates'),)
- )
+ @override_settings(TEMPLATES=[{
+ 'BACKEND': 'django.template.backends.django.DjangoTemplates',
+ 'DIRS': [os.path.join(os.path.dirname(upath(__file__)), 'bad_templates')],
+ }])
def test_bad_404_template(self):
"Errors found when rendering 404 error templates are re-raised"
try: