Ticket #16035: gzip.patch.tests.diff

django/middleware/gzip.py

@@ -32 +32 @@
         if not re_accepts_gzip.search(ae):
             return response
 
+        if response.has_header('ETag'): 
+            response['ETag'] = re.sub('"$', ';gzip"', response['ETag']) 
+
         response.content = compress_string(response.content)
         response['Content-Encoding'] = 'gzip'
         response['Content-Length'] = str(len(response.content))

tests/regressiontests/middleware/tests.py

@@ -7 +7 @@
 from django.http import HttpRequest
 from django.middleware.common import CommonMiddleware
 from django.middleware.http import ConditionalGetMiddleware
+from django.middleware.gzip import GZipMiddleware
 from django.test import TestCase
 
 
@@ -371 +372 @@
         self.resp['Last-Modified'] = 'Sat, 12 Feb 2011 17:41:44 GMT'
         self.resp = ConditionalGetMiddleware().process_response(self.req, self.resp)
         self.assertEqual(self.resp.status_code, 200)
+
+class GZipMiddlewareTest(TestCase):
+    urls = 'regressiontests.middleware.gzip_urls'
+
+    def setUp(self):
+        self.use_etags = settings.USE_ETAGS
+        settings.USE_ETAGS = True
+
+    def tearDown(self):
+        settings.USE_ETAGS = self.use_etags
+
+    def _get_request(self, path):
+        request = HttpRequest()
+        request.META = {
+            'SERVER_NAME': 'testserver',
+            'SERVER_PORT': 80,
+        }
+        request.path = request.path_info = path
+        return request
+
+    def test_short_response_not_gzipped(self):
+        request = self._get_request('/short')
+        request.META['HTTP_ACCEPT_ENCODING'] = 'gzip'
+        response = self.client.get(request.path)
+        response = GZipMiddleware().process_response(request, response)
+        self.assertEqual(response.has_header('Content-Encoding'), False)
+
+    def test_gzip_etag_differs_from_non_gzipped(self):
+        request = self._get_request('/etag')
+        request.META['HTTP_ACCEPT_ENCODING'] = ''
+        response = self.client.get(request.path)
+        response = GZipMiddleware().process_response(request, response)
+        no_gzip_etag = response['ETag']
+
+        request.META['HTTP_ACCEPT_ENCODING'] = 'gzip'
+        response = self.client.get(request.path)
+        response = GZipMiddleware().process_response(request, response)
+        self.assertEqual(response['Content-Encoding'], 'gzip')
+        gzip_etag = response['ETag']
+
+        self.assertNotEqual(no_gzip_etag, gzip_etag)

tests/regressiontests/middleware/gzip_urls.py

@@ +1 @@
+from django.conf.urls.defaults import patterns
+from django.http import HttpResponse
+
+urlpatterns = patterns('',
+    (r'^short$', lambda request: HttpResponse('This is a short response to a request.')),
+    (r'^etag$', lambda request: HttpResponse('This is the response to a request which is going to be fetched both gzipped and not. This is so we can test whether the ETag has changed for the gzipped content, and this is being quite wordy to get over the 200 character start point for being gzipped.')),
+)