mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-04 09:49:12 +00:00
Code Issues 32 Releases Wiki Activity

[1.2.X] Fixed #14919 - test isolation issue with model_inheritance.ModelInheritanceTests.test_multiple_table and views.DefaultsTests.test_csrf_token_in_404

Browse Source 
test_csrf_token_in_404 was assuming DEBUG = False, and test_multiple_table
was leaving DEBUG = True.  Both issues have been fixed.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14930 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Luke Plant 2010-12-18 19:35:46 +00:00
parent 6c357cc9bb
commit 5a33ce2500
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tests/modeltests/model_inheritance/tests.py
View File

@ -266,12 +266,16 @@ class ModelInheritanceTests(TestCase):
# select_related works with fields from the parent object as if they # select_related works with fields from the parent object as if they
# were a normal part of the model. # were a normal part of the model.
old_DEBUG = settings.DEBUG old_DEBUG = settings.DEBUG
starting_queries = len(connection.queries) try:
settings.DEBUG = True settings.DEBUG = True
starting_queries = len(connection.queries)
ItalianRestaurant.objects.all()[0].chef
self.assertEqual(len(connection.queries) - starting_queries, 2)
starting_queries = len(connection.queries)
ItalianRestaurant.objects.select_related("chef")[0].chef
self.assertEqual(len(connection.queries) - starting_queries, 1)
finally:
settings.DEBUG = old_DEBUG
ItalianRestaurant.objects.all()[0].chef
self.assertEqual(len(connection.queries) - starting_queries, 2)
starting_queries = len(connection.queries)
ItalianRestaurant.objects.select_related("chef")[0].chef
self.assertEqual(len(connection.queries) - starting_queries, 1)

15
tests/regressiontests/views/tests/defaults.py
View File

@ -60,11 +60,16 @@ class DefaultsTests(TestCase):
The 404 page should have the csrf_token available in the context The 404 page should have the csrf_token available in the context
""" """
# See ticket #14565 # See ticket #14565
for url in self.non_existing_urls: old_DEBUG = settings.DEBUG
response = self.client.get(url) try:
csrf_token = response.context['csrf_token'] settings.DEBUG = False # so we get real 404, not technical
self.assertNotEqual(str(csrf_token), 'NOTPROVIDED') for url in self.non_existing_urls:
self.assertNotEqual(str(csrf_token), '') response = self.client.get(url)
csrf_token = response.context['csrf_token']
self.assertNotEqual(str(csrf_token), 'NOTPROVIDED')
self.assertNotEqual(str(csrf_token), '')
finally:
settings.DEBUG = old_DEBUG
def test_server_error(self): def test_server_error(self):
"The server_error view raises a 500 status" "The server_error view raises a 500 status"