From 3565efaa451db6eb735a085ea6aae3fe86e6d283 Mon Sep 17 00:00:00 2001 From: Bouke Haarsma Date: Mon, 14 Oct 2013 15:14:17 +0200 Subject: Removed some direct settings manipulations in tests; refs #21230. --- tests/generic_inline_admin/tests.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'tests/generic_inline_admin') diff --git a/tests/generic_inline_admin/tests.py b/tests/generic_inline_admin/tests.py index 2c90a13c4b..d56c7fb8e8 100644 --- a/tests/generic_inline_admin/tests.py +++ b/tests/generic_inline_admin/tests.py @@ -18,7 +18,8 @@ from .models import (Episode, EpisodeExtra, EpisodeMaxNum, Media, EpisodePermanent, Category) -@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',)) +@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',), + TEMPLATE_DEBUG=True) class GenericAdminViewTest(TestCase): urls = "generic_inline_admin.urls" fixtures = ['users.xml'] @@ -27,8 +28,7 @@ class GenericAdminViewTest(TestCase): # set TEMPLATE_DEBUG to True to ensure {% include %} will raise # exceptions since that is how inlines are rendered and #9498 will # bubble up if it is an issue. - self.original_template_debug = settings.TEMPLATE_DEBUG - settings.TEMPLATE_DEBUG = True + self.client.login(username='super', password='secret') # Can't load content via a fixture (since the GenericForeignKey @@ -46,7 +46,6 @@ class GenericAdminViewTest(TestCase): def tearDown(self): self.client.logout() - settings.TEMPLATE_DEBUG = self.original_template_debug def testBasicAddGet(self): """ -- cgit v1.3