diff options
| author | Tom Christie | 2015-01-23 14:28:59 +0000 |
|---|---|---|
| committer | Tom Christie | 2015-01-23 14:28:59 +0000 |
| commit | 39f26c9eca6fa8b749f9197ad78e5cba69870e50 (patch) | |
| tree | 86ebd311194a185217e6fefb31d16316bf80779f /tests/test_parsers.py | |
| parent | 37dc2520f9adbaf54de759a1fdc41985ebd38a0e (diff) | |
| parent | 4201c9fb01beae84fc34a5b74e138e721de42de1 (diff) | |
| download | django-rest-framework-39f26c9eca6fa8b749f9197ad78e5cba69870e50.tar.bz2 | |
Merge master
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 54455cf6..8816065a 100644 --- a/tests/test_parsers.py +++ b/tests/test_parsers.py @@ -101,7 +101,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 |