summary refs log tree commit diff
path: root/tests/rest/media/v1/test_media_storage.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2021-04-16 15:45:40 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2021-04-16 15:45:40 +0100
commitec2cab331d9899534e303a4c2e58d9fce4b57813 (patch)
tree35c23ab6aee3cb884c4b90d2764f0a8011cc0a79 /tests/rest/media/v1/test_media_storage.py
parentMerge commit '8388a7fb3' into anoa/dinsic_release_1_31_0 (diff)
parentConvert internal pusher dicts to attrs classes. (#8940) (diff)
downloadsynapse-ec2cab331d9899534e303a4c2e58d9fce4b57813.tar.xz
Merge commit 'bd30cfe86' into anoa/dinsic_release_1_31_0
Diffstat (limited to 'tests/rest/media/v1/test_media_storage.py')
-rw-r--r--tests/rest/media/v1/test_media_storage.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/rest/media/v1/test_media_storage.py b/tests/rest/media/v1/test_media_storage.py

index 6f0677d335..ae2b32b131 100644 --- a/tests/rest/media/v1/test_media_storage.py +++ b/tests/rest/media/v1/test_media_storage.py
@@ -228,7 +228,7 @@ class MediaRepoTests(unittest.HomeserverTestCase): def _req(self, content_disposition): - request, channel = make_request( + channel = make_request( self.reactor, FakeSite(self.download_resource), "GET", @@ -324,7 +324,7 @@ class MediaRepoTests(unittest.HomeserverTestCase): def _test_thumbnail(self, method, expected_body, expected_found): params = "?width=32&height=32&method=" + method - request, channel = make_request( + channel = make_request( self.reactor, FakeSite(self.thumbnail_resource), "GET",