Commit b305cc33 authored by Jannis Leidel's avatar Jannis Leidel
Browse files

[1.2.X] Fixed #14468 -- Extended the list of content types that the test... 

[1.2.X] Fixed #14468 -- Extended the list of content types that the test client could guess when handling zip files. Thanks, Russ and emulbreh.

Backport from trunk (r15236).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15237 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent b9db129a

tests/regressiontests/test_client_regress/models.py

+4 −2
Original line number Diff line number Diff line
@@ -844,8 +844,10 @@ class UploadedFileEncodingTest(TestCase): 
                         encode_file('IGNORE', 'IGNORE', DummyFile("file.bin"))[2])

        self.assertEqual('Content-Type: text/plain',

                         encode_file('IGNORE', 'IGNORE', DummyFile("file.txt"))[2])

        self.assertEqual('Content-Type: application/zip',

                         encode_file('IGNORE', 'IGNORE', DummyFile("file.zip"))[2])

        self.assertIn(encode_file('IGNORE', 'IGNORE', DummyFile("file.zip"))[2], (

                        'Content-Type: application/x-compress',

                        'Content-Type: application/x-zip',

                        'Content-Type: application/x-zip-compressed'))

        self.assertEqual('Content-Type: application/octet-stream',

                         encode_file('IGNORE', 'IGNORE', DummyFile("file.unknown"))[2])