From d140318099e60591ba3275dba841070a2006066d Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Wed, 19 Jan 2011 14:41:40 +0000 Subject: [PATCH] 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 --- tests/regressiontests/test_client_regress/models.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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])