Author: jezdez Date: 2011-01-17 17:58:51 -0600 (Mon, 17 Jan 2011) New Revision: 15236
Modified: django/trunk/tests/regressiontests/test_client_regress/models.py Log: Fixed #14468 -- Extended the list of content types that the test client could guess when handling zip files. Thanks, Russ and emulbreh. Modified: django/trunk/tests/regressiontests/test_client_regress/models.py =================================================================== --- django/trunk/tests/regressiontests/test_client_regress/models.py 2011-01-17 14:03:19 UTC (rev 15235) +++ django/trunk/tests/regressiontests/test_client_regress/models.py 2011-01-17 23:58:51 UTC (rev 15236) @@ -844,8 +844,10 @@ 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]) -- You received this message because you are subscribed to the Google Groups "Django updates" group. To post to this group, send email to django-updates@googlegroups.com. To unsubscribe from this group, send email to django-updates+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/django-updates?hl=en.