gis: Merged revisions 6920-6989 via svnmerge from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@6990 bcc190cf-cafb-0310-a4f2-bffc1f526a37

2 files changed, 7 insertions, 2 deletions

diff --git a/tests/regressiontests/views/media/file.unknown b/tests/regressiontests/views/media/file.unknown
new file mode 100644
index 0000000000..77dcda8970
--- /dev/null
+++ b/tests/regressiontests/views/media/file.unknown
@@ -0,0 +1 @@
+An unknown file extension.
diff --git a/tests/regressiontests/views/tests/static.py b/tests/regressiontests/views/tests/static.py
index c731b249e8..d7e87d19d2 100644
--- a/tests/regressiontests/views/tests/static.py
+++ b/tests/regressiontests/views/tests/static.py
@@ -13,11 +13,15 @@ class StaticTests(TestCase):
             response = self.client.get('/views/site_media/%s' % filename)
             file = open(path.join(media_dir, filename))
             self.assertEquals(file.read(), response.content)
+            self.assertEquals(len(response.content), int(response['Content-Length']))
+
+    def test_unknown_mime_type(self):
+        response = self.client.get('/views/site_media/file.unknown')
+        self.assertEquals('application/octet-stream', response['Content-Type'])
 
     def test_copes_with_empty_path_component(self):
         file_name = 'file.txt'
         response = self.client.get('/views/site_media//%s' % file_name)
         file = open(path.join(media_dir, file_name))
         self.assertEquals(file.read(), response.content)
-        
-        
+