summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2011-01-19 14:41:40 +0000
committerAlex Gaynor <alex.gaynor@gmail.com>2011-01-19 14:41:40 +0000
commitd140318099e60591ba3275dba841070a2006066d (patch)
tree5350d409820757fbea5c4ff8b507433d831fd7b6
parenta38da1ae0d6cbd6411f98e6578f0a4f50c12f6b1 (diff)
Fixed a regression in the test suite from [15236].
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15244 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--tests/regressiontests/test_client_regress/models.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/regressiontests/test_client_regress/models.py b/tests/regressiontests/test_client_regress/models.py
index e337880a32..753a4f987a 100644
--- a/tests/regressiontests/test_client_regress/models.py
+++ b/tests/regressiontests/test_client_regress/models.py
@@ -847,7 +847,8 @@ class UploadedFileEncodingTest(TestCase):
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'))
+ '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])