Commit 968510e5 authored by Loic Bistuer's avatar Loic Bistuer
Browse files

Moved a test case that caused deprecation warnings. 

`cache.tests.TestEtagWithAdmin` loaded views from the `admin_views` test
package. This is problematic because when the `cache` test package is
run in isolation, `admin_views` isn't in INSTALLED_APPS, and therefore
loading its models isn't allowed since the app loading refactor.
parent 0fb83f14

tests/admin_views/tests.py

+16 −0
Original line number Diff line number Diff line
@@ -5180,3 +5180,19 @@ class AdminGenericRelationTests(TestCase): 
            validator.validate_list_filter(GenericFKAdmin, Plot)

        except ImproperlyConfigured:

            self.fail("Couldn't validate a GenericRelation -> FK path in ModelAdmin.list_filter")





@override_settings(ROOT_URLCONF="admin_views.urls")

class TestEtagWithAdminView(TestCase):

    # See https://code.djangoproject.com/ticket/16003



    def test_admin(self):

        with self.settings(USE_ETAGS=False):

            response = self.client.get('/test_admin/admin/')

            self.assertEqual(response.status_code, 302)

            self.assertFalse(response.has_header('ETag'))



        with self.settings(USE_ETAGS=True):

            response = self.client.get('/test_admin/admin/')

            self.assertEqual(response.status_code, 302)

            self.assertTrue(response.has_header('ETag'))

tests/cache/tests.py

+0 −16
Original line number Diff line number Diff line
@@ -2058,22 +2058,6 @@ class TestWithTemplateResponse(TestCase): 
        self.assertTrue(response.has_header('ETag'))





@override_settings(ROOT_URLCONF="admin_views.urls")

class TestEtagWithAdmin(TestCase):

    # See https://code.djangoproject.com/ticket/16003



    def test_admin(self):

        with self.settings(USE_ETAGS=False):

            response = self.client.get('/test_admin/admin/')

            self.assertEqual(response.status_code, 302)

            self.assertFalse(response.has_header('ETag'))



        with self.settings(USE_ETAGS=True):

            response = self.client.get('/test_admin/admin/')

            self.assertEqual(response.status_code, 302)

            self.assertTrue(response.has_header('ETag'))





class TestMakeTemplateFragmentKey(TestCase):

    def test_without_vary_on(self):

        key = make_template_fragment_key('a.fragment')