diff options
| author | Tom Christie | 2015-01-23 13:13:05 +0000 |
|---|---|---|
| committer | Tom Christie | 2015-01-23 13:13:05 +0000 |
| commit | d1fe3f65488e7ffac038e475e0575b2f3f93fda4 (patch) | |
| tree | ff70fe65a8ed03345b4c74198b5c7d96773f578f /tests/test_parsers.py | |
| parent | e56f0a928c7ec6af15a283fc48a7dded31a7d113 (diff) | |
| parent | 04a5f7bf0a268d24656ef3659f85aec95fd7590a (diff) | |
| download | django-rest-framework-d1fe3f65488e7ffac038e475e0575b2f3f93fda4.tar.bz2 | |
Merge pull request #2446 from tomchristie/django-18-alpha
Support 1.8-alpha.
Diffstat (limited to 'tests/test_parsers.py')
| -rw-r--r-- | tests/test_parsers.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/test_parsers.py b/tests/test_parsers.py index d28d8bd4..1d2054ac 100644 --- a/tests/test_parsers.py +++ b/tests/test_parsers.py @@ -161,7 +161,9 @@ class TestFileUploadParser(TestCase): self.__replace_content_disposition('inline; filename=fallback.txt; filename*=utf-8--ÀĥƦ.txt') filename = parser.get_filename(self.stream, None, self.parser_context) - self.assertEqual(filename, 'fallback.txt') + # Malformed. Either None or 'fallback.txt' will be acceptable. + # See also https://code.djangoproject.com/ticket/24209 + self.assertIn(filename, ('fallback.txt', None)) def __replace_content_disposition(self, disposition): self.parser_context['request'].META['HTTP_CONTENT_DISPOSITION'] = disposition |