summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tests/regressiontests/test_client_regress/models.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/regressiontests/test_client_regress/models.py b/tests/regressiontests/test_client_regress/models.py
index 1281b91ad8..e337880a32 100644
--- a/tests/regressiontests/test_client_regress/models.py
+++ b/tests/regressiontests/test_client_regress/models.py
@@ -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])