diff options
| author | Richard van der Hoff <richard@matrix.org> | 2020-11-13 23:11:43 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2020-11-15 23:09:03 +0000 |
| commit | cfd895a22e7563b6b22141d14d9c8aebf177df44 (patch) | |
| tree | 0a2259d1f2d45646b946c7f060ae6dfc97edef8d /tests/rest/admin/test_media.py | |
| parent | fix dict handling for make_request() (diff) | |
| download | synapse-cfd895a22e7563b6b22141d14d9c8aebf177df44.tar.xz | |
use global make_request() directly where we have a custom Resource
Where we want to render a request against a specific Resource, call the global make_request() function rather than the one in HomeserverTestCase, allowing us to pass in an appropriate `Site`.
Diffstat (limited to 'tests/rest/admin/test_media.py')
| -rw-r--r-- | tests/rest/admin/test_media.py | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/tests/rest/admin/test_media.py b/tests/rest/admin/test_media.py index 721fa1ed51..36e07f1b36 100644 --- a/tests/rest/admin/test_media.py +++ b/tests/rest/admin/test_media.py @@ -23,6 +23,7 @@ from synapse.rest.client.v1 import login, profile, room from synapse.rest.media.v1.filepath import MediaFilePaths from tests import unittest +from tests.server import FakeSite, make_request class DeleteMediaByIDTestCase(unittest.HomeserverTestCase): @@ -124,7 +125,9 @@ class DeleteMediaByIDTestCase(unittest.HomeserverTestCase): self.assertEqual(server_name, self.server_name) # Attempt to access media - request, channel = self.make_request( + request, channel = make_request( + self.reactor, + FakeSite(download_resource), "GET", server_and_media_id, shorthand=False, @@ -161,7 +164,9 @@ class DeleteMediaByIDTestCase(unittest.HomeserverTestCase): ) # Attempt to access media - request, channel = self.make_request( + request, channel = make_request( + self.reactor, + FakeSite(download_resource), "GET", server_and_media_id, shorthand=False, @@ -535,7 +540,9 @@ class DeleteMediaByDateSizeTestCase(unittest.HomeserverTestCase): media_id = server_and_media_id.split("/")[1] local_path = self.filepaths.local_media_filepath(media_id) - request, channel = self.make_request( + request, channel = make_request( + self.reactor, + FakeSite(download_resource), "GET", server_and_media_id, shorthand=False, |