From a686096c262b706b1367abc87436ae9dc47dbe2a Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Sun, 26 Sep 2010 15:10:41 +0000 Subject: Fixed #7535 -- Correctly set Content-Encoding header in static files serving view. Thanks for the report and patch, Kevin Hunter. git-svn-id: http://code.djangoproject.com/svn/django/trunk@13868 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- tests/regressiontests/views/media/file.txt.gz | Bin 0 -> 51 bytes tests/regressiontests/views/tests/static.py | 8 +++++--- 2 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 tests/regressiontests/views/media/file.txt.gz (limited to 'tests') diff --git a/tests/regressiontests/views/media/file.txt.gz b/tests/regressiontests/views/media/file.txt.gz new file mode 100644 index 0000000000..0ee7d18311 Binary files /dev/null and b/tests/regressiontests/views/media/file.txt.gz differ diff --git a/tests/regressiontests/views/tests/static.py b/tests/regressiontests/views/tests/static.py index d7e87d19d2..fdd31b4660 100644 --- a/tests/regressiontests/views/tests/static.py +++ b/tests/regressiontests/views/tests/static.py @@ -1,3 +1,4 @@ +import mimetypes from os import path from django.test import TestCase @@ -8,12 +9,13 @@ class StaticTests(TestCase): def test_serve(self): "The static view can serve static media" - media_files = ['file.txt',] + media_files = ['file.txt', 'file.txt.gz'] for filename in media_files: response = self.client.get('/views/site_media/%s' % filename) - file = open(path.join(media_dir, filename)) - self.assertEquals(file.read(), response.content) + file_path = path.join(media_dir, filename) + self.assertEquals(open(file_path).read(), response.content) self.assertEquals(len(response.content), int(response['Content-Length'])) + self.assertEquals(mimetypes.guess_type(file_path)[1], response.get('Content-Encoding', None)) def test_unknown_mime_type(self): response = self.client.get('/views/site_media/file.unknown') -- cgit v1.3