More graceful handling of malformed Content-Disposition

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