From 48d57788ee56811fa77cd37b9edf40535f82d87e Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Sat, 2 Sep 2017 21:09:22 -0400 Subject: Refs #26447 -- Removed the USE_ETAGS setting per deprecation timeline. --- tests/admin_views/tests.py | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) (limited to 'tests/admin_views') diff --git a/tests/admin_views/tests.py b/tests/admin_views/tests.py index 10e1303659..ff06dbae19 100644 --- a/tests/admin_views/tests.py +++ b/tests/admin_views/tests.py @@ -25,14 +25,12 @@ from django.core.files import temp as tempfile from django.forms.utils import ErrorList from django.template.response import TemplateResponse from django.test import ( - SimpleTestCase, TestCase, ignore_warnings, modify_settings, - override_settings, skipUnlessDBFeature, + TestCase, modify_settings, override_settings, skipUnlessDBFeature, ) from django.test.utils import override_script_prefix, patch_logger from django.urls import NoReverseMatch, resolve, reverse from django.utils import formats, translation from django.utils.cache import get_max_age -from django.utils.deprecation import RemovedInDjango21Warning from django.utils.encoding import force_bytes, force_text, iri_to_uri from django.utils.html import escape from django.utils.http import urlencode @@ -5809,22 +5807,6 @@ class InlineAdminViewOnSiteTest(TestCase): self.assertContains(response, '"/worker_inline/%s/%s/"' % (self.w1.surname, self.w1.name)) -@override_settings(ROOT_URLCONF='admin_views.urls') -class TestETagWithAdminView(SimpleTestCase): - # The admin is compatible with ETags (#16003). - - def test_admin(self): - with self.settings(USE_ETAGS=False): - response = self.client.get(reverse('admin:index')) - self.assertEqual(response.status_code, 302) - self.assertFalse(response.has_header('ETag')) - - with self.settings(USE_ETAGS=True), ignore_warnings(category=RemovedInDjango21Warning): - response = self.client.get(reverse('admin:index')) - self.assertEqual(response.status_code, 302) - self.assertTrue(response.has_header('ETag')) - - @override_settings(ROOT_URLCONF='admin_views.urls') class GetFormsetsWithInlinesArgumentTest(TestCase): """ -- cgit v1.3