Commit 715c00df authored by Ramiro Morales's avatar Ramiro Morales
Browse files

[1.2.X] Fixed a regression in the test suite from [15236]. Backport of r15244. 

Also, changed an asertion not supported by unittest.

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

tests/regressiontests/test_client_regress/models.py

+3 −2
Original line number Diff line number Diff line
@@ -844,10 +844,11 @@ 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.assertIn(encode_file('IGNORE', 'IGNORE', DummyFile("file.zip"))[2], (

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

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

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

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

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

                        'Content-Type: application/zip'))

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

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