Refs #26447 -- Removed the USE_ETAGS setting per deprecation timeline.

1 files changed, 1 insertions, 57 deletions

diff --git a/tests/middleware/tests.py b/tests/middleware/tests.py
index 8006938a5e..f3c8b9ca06 100644
--- a/tests/middleware/tests.py
+++ b/tests/middleware/tests.py
@@ -18,10 +18,7 @@ from django.middleware.common import (
 )
 from django.middleware.gzip import GZipMiddleware
 from django.middleware.http import ConditionalGetMiddleware
-from django.test import (
-    RequestFactory, SimpleTestCase, ignore_warnings, override_settings,
-)
-from django.utils.deprecation import RemovedInDjango21Warning
+from django.test import RequestFactory, SimpleTestCase, override_settings
 
 int2byte = struct.Struct(">B").pack
 
@@ -265,57 +262,6 @@ class CommonMiddlewareTest(SimpleTestCase):
         self.assertEqual(r.status_code, 301)
         self.assertEqual(r.url, 'http://www.testserver/customurlconf/slash/')
 
-    # ETag + If-Not-Modified support tests
-
-    @ignore_warnings(category=RemovedInDjango21Warning)
-    @override_settings(USE_ETAGS=True)
-    def test_etag(self):
-        req = HttpRequest()
-        res = HttpResponse('content')
-        self.assertTrue(CommonMiddleware().process_response(req, res).has_header('ETag'))
-
-    @ignore_warnings(category=RemovedInDjango21Warning)
-    @override_settings(USE_ETAGS=True)
-    def test_etag_streaming_response(self):
-        req = HttpRequest()
-        res = StreamingHttpResponse(['content'])
-        res['ETag'] = 'tomatoes'
-        self.assertEqual(CommonMiddleware().process_response(req, res).get('ETag'), 'tomatoes')
-
-    @ignore_warnings(category=RemovedInDjango21Warning)
-    @override_settings(USE_ETAGS=True)
-    def test_no_etag_streaming_response(self):
-        req = HttpRequest()
-        res = StreamingHttpResponse(['content'])
-        self.assertFalse(CommonMiddleware().process_response(req, res).has_header('ETag'))
-
-    @ignore_warnings(category=RemovedInDjango21Warning)
-    @override_settings(USE_ETAGS=True)
-    def test_no_etag_no_store_cache(self):
-        req = HttpRequest()
-        res = HttpResponse('content')
-        res['Cache-Control'] = 'No-Cache, No-Store, Max-age=0'
-        self.assertFalse(CommonMiddleware().process_response(req, res).has_header('ETag'))
-
-    @ignore_warnings(category=RemovedInDjango21Warning)
-    @override_settings(USE_ETAGS=True)
-    def test_etag_extended_cache_control(self):
-        req = HttpRequest()
-        res = HttpResponse('content')
-        res['Cache-Control'] = 'my-directive="my-no-store"'
-        self.assertTrue(CommonMiddleware().process_response(req, res).has_header('ETag'))
-
-    @ignore_warnings(category=RemovedInDjango21Warning)
-    @override_settings(USE_ETAGS=True)
-    def test_if_none_match(self):
-        first_req = HttpRequest()
-        first_res = CommonMiddleware().process_response(first_req, HttpResponse('content'))
-        second_req = HttpRequest()
-        second_req.method = 'GET'
-        second_req.META['HTTP_IF_NONE_MATCH'] = first_res['ETag']
-        second_res = CommonMiddleware().process_response(second_req, HttpResponse('content'))
-        self.assertEqual(second_res.status_code, 304)
-
     # Tests for the Content-Length header
 
     def test_content_length_header_added(self):
@@ -855,8 +801,6 @@ class GZipMiddlewareTest(SimpleTestCase):
         self.assertEqual(self.get_mtime(r2.content), 0)
 
 
-@ignore_warnings(category=RemovedInDjango21Warning)
-@override_settings(USE_ETAGS=True)
 class ETagGZipMiddlewareTest(SimpleTestCase):
     """
     ETags are handled properly by GZipMiddleware.