Ticket #14543: patch.diff

django/contrib/contenttypes/tests.py

@@ -3 +3 @@
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.sites.models import Site
 from django.contrib.contenttypes.views import shortcut
-from django.core.exceptions import ObjectDoesNotExist
+from django.contrib.auth.models import User
 from django.http import HttpRequest
 from django.test import TestCase
+from django.utils import unittest
 
-
 class ContentTypesTests(TestCase):
 
     def setUp(self):
@@ -46 +46 @@
         len(db.connection.queries)
         self.assertEqual(2, len(db.connection.queries))
 
+    @unittest.skipUnless(User._meta.installed, "Requires Auth app")
     def test_shortcut_view(self):
         """
         Check that the shortcut view (used for the admin "view on site"
@@ -58 +59 @@
             "SERVER_NAME": "Example.com",
             "SERVER_PORT": "80",
         }
-        from django.contrib.auth.models import User
         user_ct = ContentType.objects.get_for_model(User)
         obj = User.objects.create(username="john")
         Site._meta.installed = True