[1.2.X] Fixed #14919 - test isolation issue with model_inheritance.Mo…

…delInheritanceTests.test_multiple_table and views.DefaultsTests.test_csrf_token_in_404

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

tests/modeltests/model_inheritance/tests.py

@@ -266,12 +266,16 @@ def test_multiple_table(self):
         # select_related works with fields from the parent object as if they
         # were a normal part of the model.
         old_DEBUG = settings.DEBUG
-        starting_queries = len(connection.queries)
-        settings.DEBUG = True
+        try:
+            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)

tests/regressiontests/views/tests/defaults.py

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