diff options
| author | Patrick Cloke <clokep@users.noreply.github.com> | 2021-01-15 11:18:09 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-15 11:18:09 -0500 |
| commit | 3e4cdfe5d9b6152b9a0b7f7ad22623c2bf19f7ff (patch) | |
| tree | 43158bf0c147a5a2e8174c8ba29067a02cef490d /tests/rest/admin/test_admin.py | |
| parent | Avoid raising the body exceeded error multiple times. (#9108) (diff) | |
| download | synapse-3e4cdfe5d9b6152b9a0b7f7ad22623c2bf19f7ff.tar.xz | |
Add an admin API endpoint to protect media. (#9086)
Protecting media stops it from being quarantined when e.g. all media in a room is quarantined. This is useful for sticker packs and other media that is uploaded by server administrators, but used by many people.
Diffstat (limited to '')
| -rw-r--r-- | tests/rest/admin/test_admin.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/tests/rest/admin/test_admin.py b/tests/rest/admin/test_admin.py index 586b877bda..9d22c04073 100644 --- a/tests/rest/admin/test_admin.py +++ b/tests/rest/admin/test_admin.py @@ -153,8 +153,6 @@ class QuarantineMediaTestCase(unittest.HomeserverTestCase): ] def prepare(self, reactor, clock, hs): - self.store = hs.get_datastore() - # Allow for uploading and downloading to/from the media repo self.media_repo = hs.get_media_repository_resource() self.download_resource = self.media_repo.children[b"download"] @@ -428,7 +426,11 @@ class QuarantineMediaTestCase(unittest.HomeserverTestCase): # Mark the second item as safe from quarantine. _, media_id_2 = server_and_media_id_2.split("/") - self.get_success(self.store.mark_local_media_as_safe(media_id_2)) + # Quarantine the media + url = "/_synapse/admin/v1/media/protect/%s" % (urllib.parse.quote(media_id_2),) + channel = self.make_request("POST", url, access_token=admin_user_tok) + self.pump(1.0) + self.assertEqual(200, int(channel.code), msg=channel.result["body"]) # Quarantine all media by this user url = "/_synapse/admin/v1/user/%s/media/quarantine" % urllib.parse.quote( |