summaryrefslogtreecommitdiff
path: root/tests/generic_inline_admin/tests.py
diff options
context:
space:
mode:
authorBouke Haarsma <bouke@webatoom.nl>2013-10-14 15:14:17 +0200
committerTim Graham <timograham@gmail.com>2013-10-21 11:31:05 -0400
commit3565efaa451db6eb735a085ea6aae3fe86e6d283 (patch)
tree7030dcebfb01ef75bd1d6b308fd21caea3f20034 /tests/generic_inline_admin/tests.py
parent499cd912ca36597df737df73c8f91ffab36c83d9 (diff)
Removed some direct settings manipulations in tests; refs #21230.
Diffstat (limited to 'tests/generic_inline_admin/tests.py')
-rw-r--r--tests/generic_inline_admin/tests.py7
1 files changed, 3 insertions, 4 deletions
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):
"""