diff --git a/tests/handlers/test_profile.py b/tests/handlers/test_profile.py
index b7d6187a21..60235e5699 100644
--- a/tests/handlers/test_profile.py
+++ b/tests/handlers/test_profile.py
@@ -257,30 +257,22 @@ class ProfileTestCase(unittest.HomeserverTestCase):
# The first check that's done by this method is whether the file exists; if we
# don't get an error on a non-existing file then it means all of the checks were
# successfully skipped.
- allowed = self.get_success(
- self.handler._check_avatar_size_and_mime_type("mxc://test/unknown_file")
+ res = self.get_success(
+ self.handler.check_avatar_size_and_mime_type("mxc://test/unknown_file")
)
- self.assertTrue(allowed)
+ self.assertTrue(res)
- @unittest.override_config(
- {
- "max_avatar_size": 50,
- }
- )
+ @unittest.override_config({"max_avatar_size": 50})
def test_avatar_constraints_missing(self):
"""Tests that an avatar isn't allowed if the file at the given MXC URI couldn't
be found.
"""
- allowed = self.get_success(
- self.handler._check_avatar_size_and_mime_type("mxc://test/unknown_file")
+ res = self.get_success(
+ self.handler.check_avatar_size_and_mime_type("mxc://test/unknown_file")
)
- self.assertFalse(allowed)
+ self.assertFalse(res)
- @unittest.override_config(
- {
- "max_avatar_size": 50,
- }
- )
+ @unittest.override_config({"max_avatar_size": 50})
def test_avatar_constraints_file_size(self):
"""Tests that a file that's above the allowed file size is forbidden but one
that's below it is allowed.
@@ -292,21 +284,17 @@ class ProfileTestCase(unittest.HomeserverTestCase):
}
)
- allowed = self.get_success(
- self.handler._check_avatar_size_and_mime_type("mxc://test/small")
+ res = self.get_success(
+ self.handler.check_avatar_size_and_mime_type("mxc://test/small")
)
- self.assertTrue(allowed)
+ self.assertTrue(res)
- allowed = self.get_success(
- self.handler._check_avatar_size_and_mime_type("mxc://test/big")
+ res = self.get_success(
+ self.handler.check_avatar_size_and_mime_type("mxc://test/big")
)
- self.assertFalse(allowed)
+ self.assertFalse(res)
- @unittest.override_config(
- {
- "allowed_avatar_mimetypes": ["image/png"],
- }
- )
+ @unittest.override_config({"allowed_avatar_mimetypes": ["image/png"]})
def test_avatar_constraint_mime_type(self):
"""Tests that a file with an unauthorised MIME type is forbidden but one with
an authorised content type is allowed.
@@ -318,15 +306,15 @@ class ProfileTestCase(unittest.HomeserverTestCase):
}
)
- allowed = self.get_success(
- self.handler._check_avatar_size_and_mime_type("mxc://test/good")
+ res = self.get_success(
+ self.handler.check_avatar_size_and_mime_type("mxc://test/good")
)
- self.assertTrue(allowed)
+ self.assertTrue(res)
- allowed = self.get_success(
- self.handler._check_avatar_size_and_mime_type("mxc://test/bad")
+ res = self.get_success(
+ self.handler.check_avatar_size_and_mime_type("mxc://test/bad")
)
- self.assertFalse(allowed)
+ self.assertFalse(res)
def _setup_local_files(self, names_and_props: Dict[str, Dict[str, Any]]):
"""Stores metadata about files in the database.
diff --git a/tests/rest/client/test_profile.py b/tests/rest/client/test_profile.py
index 140e62a46a..ead883ded8 100644
--- a/tests/rest/client/test_profile.py
+++ b/tests/rest/client/test_profile.py
@@ -155,11 +155,7 @@ class ProfileTestCase(unittest.HomeserverTestCase):
self.assertEqual(channel.code, 200, channel.result)
return channel.json_body.get("avatar_url")
- @unittest.override_config(
- {
- "max_avatar_size": 50,
- }
- )
+ @unittest.override_config({"max_avatar_size": 50})
def test_avatar_size_limit_global(self):
"""Tests that the maximum size limit for avatars is enforced when updating a
global profile.
@@ -173,7 +169,7 @@ class ProfileTestCase(unittest.HomeserverTestCase):
channel = self.make_request(
"PUT",
- "/profile/%s/avatar_url" % (self.owner,),
+ f"/profile/{self.owner}/avatar_url",
content={"avatar_url": "mxc://test/big"},
access_token=self.owner_tok,
)
@@ -184,17 +180,13 @@ class ProfileTestCase(unittest.HomeserverTestCase):
channel = self.make_request(
"PUT",
- "/profile/%s/avatar_url" % (self.owner,),
+ f"/profile/{self.owner}/avatar_url",
content={"avatar_url": "mxc://test/small"},
access_token=self.owner_tok,
)
self.assertEqual(channel.code, 200, channel.result)
- @unittest.override_config(
- {
- "max_avatar_size": 50,
- }
- )
+ @unittest.override_config({"max_avatar_size": 50})
def test_avatar_size_limit_per_room(self):
"""Tests that the maximum size limit for avatars is enforced when updating a
per-room profile.
@@ -210,7 +202,7 @@ class ProfileTestCase(unittest.HomeserverTestCase):
channel = self.make_request(
"PUT",
- "/rooms/%s/state/m.room.member/%s" % (room_id, self.owner),
+ f"/rooms/{room_id}/state/m.room.member/{self.owner}",
content={"membership": "join", "avatar_url": "mxc://test/big"},
access_token=self.owner_tok,
)
@@ -221,17 +213,13 @@ class ProfileTestCase(unittest.HomeserverTestCase):
channel = self.make_request(
"PUT",
- "/rooms/%s/state/m.room.member/%s" % (room_id, self.owner),
+ f"/rooms/{room_id}/state/m.room.member/{self.owner}",
content={"membership": "join", "avatar_url": "mxc://test/small"},
access_token=self.owner_tok,
)
self.assertEqual(channel.code, 200, channel.result)
- @unittest.override_config(
- {
- "allowed_avatar_mimetypes": ["image/png"],
- }
- )
+ @unittest.override_config({"allowed_avatar_mimetypes": ["image/png"]})
def test_avatar_allowed_mime_type_global(self):
"""Tests that the MIME type whitelist for avatars is enforced when updating a
global profile.
@@ -245,7 +233,7 @@ class ProfileTestCase(unittest.HomeserverTestCase):
channel = self.make_request(
"PUT",
- "/profile/%s/avatar_url" % (self.owner,),
+ f"/profile/{self.owner}/avatar_url",
content={"avatar_url": "mxc://test/bad"},
access_token=self.owner_tok,
)
@@ -256,17 +244,13 @@ class ProfileTestCase(unittest.HomeserverTestCase):
channel = self.make_request(
"PUT",
- "/profile/%s/avatar_url" % (self.owner,),
+ f"/profile/{self.owner}/avatar_url",
content={"avatar_url": "mxc://test/good"},
access_token=self.owner_tok,
)
self.assertEqual(channel.code, 200, channel.result)
- @unittest.override_config(
- {
- "allowed_avatar_mimetypes": ["image/png"],
- }
- )
+ @unittest.override_config({"allowed_avatar_mimetypes": ["image/png"]})
def test_avatar_allowed_mime_type_per_room(self):
"""Tests that the MIME type whitelist for avatars is enforced when updating a
per-room profile.
@@ -282,7 +266,7 @@ class ProfileTestCase(unittest.HomeserverTestCase):
channel = self.make_request(
"PUT",
- "/rooms/%s/state/m.room.member/%s" % (room_id, self.owner),
+ f"/rooms/{room_id}/state/m.room.member/{self.owner}",
content={"membership": "join", "avatar_url": "mxc://test/bad"},
access_token=self.owner_tok,
)
@@ -293,7 +277,7 @@ class ProfileTestCase(unittest.HomeserverTestCase):
channel = self.make_request(
"PUT",
- "/rooms/%s/state/m.room.member/%s" % (room_id, self.owner),
+ f"/rooms/{room_id}/state/m.room.member/{self.owner}",
content={"membership": "join", "avatar_url": "mxc://test/good"},
access_token=self.owner_tok,
)
|
