summary refs log tree commit diff
path: root/tests/rest/media/v1/test_base.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-05-14 11:12:22 +0100
committerRichard van der Hoff <richard@matrix.org>2019-05-14 11:12:22 +0100
commit9feee29d76555de7c2720ac661e7d9106dc51be3 (patch)
treef52c39344606d29b6876f3ca916323e11fd83d6d /tests/rest/media/v1/test_base.py
parentMerge commit 'a845abbf3' into matrix-org-hotfixes (diff)
parent0.99.4rc1 (diff)
downloadsynapse-9feee29d76555de7c2720ac661e7d9106dc51be3.tar.xz
Merge tag 'v0.99.4rc1' into matrix-org-hotfixes
v0.99.4rc1
Diffstat (limited to 'tests/rest/media/v1/test_base.py')
-rw-r--r--tests/rest/media/v1/test_base.py14
1 files changed, 4 insertions, 10 deletions
diff --git a/tests/rest/media/v1/test_base.py b/tests/rest/media/v1/test_base.py

index af8f74eb42..00688a7325 100644 --- a/tests/rest/media/v1/test_base.py +++ b/tests/rest/media/v1/test_base.py
@@ -26,20 +26,14 @@ class GetFileNameFromHeadersTests(unittest.TestCase): b'inline; filename="aze%20rty"': u"aze%20rty", b'inline; filename="aze\"rty"': u'aze"rty', b'inline; filename="azer;ty"': u"azer;ty", - b"inline; filename*=utf-8''foo%C2%A3bar": u"foo£bar", } def tests(self): for hdr, expected in self.TEST_CASES.items(): - res = get_filename_from_headers( - { - b'Content-Disposition': [hdr], - }, - ) + res = get_filename_from_headers({b'Content-Disposition': [hdr]}) self.assertEqual( - res, expected, - "expected output for %s to be %s but was %s" % ( - hdr, expected, res, - ) + res, + expected, + "expected output for %s to be %s but was %s" % (hdr, expected, res), )