diff --git a/tests/federation/transport/test_knocking.py b/tests/federation/transport/test_knocking.py
index 5b928480e7..fbce19f38b 100644
--- a/tests/federation/transport/test_knocking.py
+++ b/tests/federation/transport/test_knocking.py
@@ -34,7 +34,10 @@ KNOCK_UNSTABLE_IDENTIFIER = "xyz.amorgan.knock"
class KnockingStrippedStateEventHelperMixin(TestCase):
def send_example_state_events_to_room(
- self, hs: "HomeServer", room_id: str, sender: str,
+ self,
+ hs: "HomeServer",
+ room_id: str,
+ sender: str,
) -> OrderedDict:
"""Adds some state to a room. State events are those that should be sent to a knocking
user after they knock on the room, as well as some state that *shouldn't* be sent
@@ -133,7 +136,9 @@ class KnockingStrippedStateEventHelperMixin(TestCase):
return room_state
def check_knock_room_state_against_room_state(
- self, knock_room_state: List[Dict], expected_room_state: Dict,
+ self,
+ knock_room_state: List[Dict],
+ expected_room_state: Dict,
) -> None:
"""Test a list of stripped room state events received over federation against a
dict of expected state events.
diff --git a/tests/handlers/test_presence.py b/tests/handlers/test_presence.py
index be2ee26f07..996c614198 100644
--- a/tests/handlers/test_presence.py
+++ b/tests/handlers/test_presence.py
@@ -521,7 +521,7 @@ class PresenceJoinTestCase(unittest.HomeserverTestCase):
)
self.assertEqual(expected_state.state, PresenceState.ONLINE)
self.federation_sender.send_presence_to_destinations.assert_called_once_with(
- destinations=["server2"], states=[expected_state]
+ destinations=["server2"], states={expected_state}
)
#
@@ -533,7 +533,7 @@ class PresenceJoinTestCase(unittest.HomeserverTestCase):
self.federation_sender.send_presence.assert_not_called()
self.federation_sender.send_presence_to_destinations.assert_called_once_with(
- destinations=["server3"], states=[expected_state]
+ destinations=["server3"], states={expected_state}
)
def test_remote_gets_presence_when_local_user_joins(self):
@@ -584,8 +584,14 @@ class PresenceJoinTestCase(unittest.HomeserverTestCase):
self.presence_handler.current_state_for_user("@test2:server")
)
self.assertEqual(expected_state.state, PresenceState.ONLINE)
- self.federation_sender.send_presence_to_destinations.assert_called_once_with(
- destinations={"server2", "server3"}, states=[expected_state]
+ self.assertEqual(
+ self.federation_sender.send_presence_to_destinations.call_count, 2
+ )
+ self.federation_sender.send_presence_to_destinations.assert_any_call(
+ destinations=["server3"], states={expected_state}
+ )
+ self.federation_sender.send_presence_to_destinations.assert_any_call(
+ destinations=["server2"], states={expected_state}
)
def _add_new_user(self, room_id, user_id):
diff --git a/tests/handlers/test_profile.py b/tests/handlers/test_profile.py
index 909984b3be..cbbe7280c7 100644
--- a/tests/handlers/test_profile.py
+++ b/tests/handlers/test_profile.py
@@ -161,7 +161,11 @@ class ProfileTestCase(unittest.HomeserverTestCase):
response = self.get_success(
self.query_handlers["profile"](
- {"user_id": "@caroline:test", "field": "displayname"}
+ {
+ "user_id": "@caroline:test",
+ "field": "displayname",
+ "origin": "servername.tld",
+ }
)
)
diff --git a/tests/handlers/test_user_directory.py b/tests/handlers/test_user_directory.py
index ddfe6950e1..dbe68bb058 100644
--- a/tests/handlers/test_user_directory.py
+++ b/tests/handlers/test_user_directory.py
@@ -619,7 +619,10 @@ class UserDirectoryTestCase(unittest.HomeserverTestCase):
[self.assertIn(user, remote_users) for user in received_user_id_ordering[3:]]
def _add_user_to_room(
- self, room_id: str, room_version: RoomVersion, user_id: str,
+ self,
+ room_id: str,
+ room_version: RoomVersion,
+ user_id: str,
):
# Add a user to the room.
builder = self.event_builder_factory.for_room_version(
diff --git a/tests/http/test_proxyagent.py b/tests/http/test_proxyagent.py
index 4e1a5a5138..34df39429b 100644
--- a/tests/http/test_proxyagent.py
+++ b/tests/http/test_proxyagent.py
@@ -184,7 +184,9 @@ class MatrixFederationAgentTests(TestCase):
)
def test_https_request_via_no_proxy(self):
agent = ProxyAgent(
- self.reactor, contextFactory=get_test_https_policy(), use_proxy=True,
+ self.reactor,
+ contextFactory=get_test_https_policy(),
+ use_proxy=True,
)
self._test_request_direct_connection(agent, b"https", b"test.com", b"abc")
@@ -196,7 +198,9 @@ class MatrixFederationAgentTests(TestCase):
@patch.dict(os.environ, {"https_proxy": "proxy.com", "no_proxy": "*"})
def test_https_request_via_no_proxy_star(self):
agent = ProxyAgent(
- self.reactor, contextFactory=get_test_https_policy(), use_proxy=True,
+ self.reactor,
+ contextFactory=get_test_https_policy(),
+ use_proxy=True,
)
self._test_request_direct_connection(agent, b"https", b"test.com", b"abc")
@@ -252,10 +256,13 @@ class MatrixFederationAgentTests(TestCase):
self._do_https_request_via_proxy(auth_credentials="bob:pinkponies")
def _do_https_request_via_proxy(
- self, auth_credentials: Optional[str] = None,
+ self,
+ auth_credentials: Optional[str] = None,
):
agent = ProxyAgent(
- self.reactor, contextFactory=get_test_https_policy(), use_proxy=True,
+ self.reactor,
+ contextFactory=get_test_https_policy(),
+ use_proxy=True,
)
self.reactor.lookups["proxy.com"] = "1.2.3.5"
diff --git a/tests/rest/client/test_room_access_rules.py b/tests/rest/client/test_room_access_rules.py
index 97f379b5a5..6344fcdf6a 100644
--- a/tests/rest/client/test_room_access_rules.py
+++ b/tests/rest/client/test_room_access_rules.py
@@ -86,7 +86,9 @@ class RoomAccessTestCase(unittest.HomeserverTestCase):
mock_federation_client = Mock(spec=["send_invite"])
mock_federation_client.send_invite.side_effect = send_invite
- mock_http_client = Mock(spec=["get_json", "post_json_get_json"],)
+ mock_http_client = Mock(
+ spec=["get_json", "post_json_get_json"],
+ )
# Mocking the response for /info on the IS API.
mock_http_client.get_json.side_effect = get_json
# Mocking the response for /store-invite on the IS API.
@@ -154,8 +156,7 @@ class RoomAccessTestCase(unittest.HomeserverTestCase):
self.create_room(rule=AccessRules.DIRECT, expected_code=400)
def test_create_room_direct_invalid_rule(self):
- """Tests that creating a direct room with an invalid rule will fail.
- """
+ """Tests that creating a direct room with an invalid rule will fail."""
self.create_room(direct=True, rule=AccessRules.RESTRICTED, expected_code=400)
def test_create_room_default_power_level_rules(self):
@@ -234,7 +235,9 @@ class RoomAccessTestCase(unittest.HomeserverTestCase):
"""
# Creates a room with the default power levels
room_id = self.create_room(
- direct=True, rule=AccessRules.DIRECT, expected_code=200,
+ direct=True,
+ rule=AccessRules.DIRECT,
+ expected_code=200,
)
# Attempt to drop invite and state_default power levels after the fact
@@ -854,22 +857,30 @@ class RoomAccessTestCase(unittest.HomeserverTestCase):
"""
def freeze_room_with_id_and_power_levels(
- room_id: str, custom_power_levels_content: Optional[JsonDict] = None,
+ room_id: str,
+ custom_power_levels_content: Optional[JsonDict] = None,
):
# Invite a user to the room, they join with PL 0
self.helper.invite(
- room=room_id, src=self.user_id, targ=self.invitee_id, tok=self.tok,
+ room=room_id,
+ src=self.user_id,
+ targ=self.invitee_id,
+ tok=self.tok,
)
# Invitee joins the room
self.helper.join(
- room=room_id, user=self.invitee_id, tok=self.invitee_tok,
+ room=room_id,
+ user=self.invitee_id,
+ tok=self.invitee_tok,
)
if not custom_power_levels_content:
# Retrieve the room's current power levels event content
power_levels = self.helper.get_state(
- room_id=room_id, event_type="m.room.power_levels", tok=self.tok,
+ room_id=room_id,
+ event_type="m.room.power_levels",
+ tok=self.tok,
)
else:
power_levels = custom_power_levels_content
@@ -884,12 +895,16 @@ class RoomAccessTestCase(unittest.HomeserverTestCase):
# Ensure that the invitee leaving the room does not change the power levels
self.helper.leave(
- room=room_id, user=self.invitee_id, tok=self.invitee_tok,
+ room=room_id,
+ user=self.invitee_id,
+ tok=self.invitee_tok,
)
# Retrieve the new power levels of the room
new_power_levels = self.helper.get_state(
- room_id=room_id, event_type="m.room.power_levels", tok=self.tok,
+ room_id=room_id,
+ event_type="m.room.power_levels",
+ tok=self.tok,
)
# Ensure they have not changed
@@ -897,22 +912,31 @@ class RoomAccessTestCase(unittest.HomeserverTestCase):
# Invite the user back again
self.helper.invite(
- room=room_id, src=self.user_id, targ=self.invitee_id, tok=self.tok,
+ room=room_id,
+ src=self.user_id,
+ targ=self.invitee_id,
+ tok=self.tok,
)
# Invitee joins the room
self.helper.join(
- room=room_id, user=self.invitee_id, tok=self.invitee_tok,
+ room=room_id,
+ user=self.invitee_id,
+ tok=self.invitee_tok,
)
# Now the admin leaves the room
self.helper.leave(
- room=room_id, user=self.user_id, tok=self.tok,
+ room=room_id,
+ user=self.user_id,
+ tok=self.tok,
)
# Check the power levels again
new_power_levels = self.helper.get_state(
- room_id=room_id, event_type="m.room.power_levels", tok=self.invitee_tok,
+ room_id=room_id,
+ event_type="m.room.power_levels",
+ tok=self.invitee_tok,
)
# Ensure that the new power levels prevent anyone but admins from sending
@@ -1002,7 +1026,10 @@ class RoomAccessTestCase(unittest.HomeserverTestCase):
content["power_levels_content_override"] = power_levels_content_override
channel = self.make_request(
- "POST", "/_matrix/client/r0/createRoom", content, access_token=self.tok,
+ "POST",
+ "/_matrix/client/r0/createRoom",
+ content,
+ access_token=self.tok,
)
self.assertEqual(channel.code, expected_code, channel.result)
diff --git a/tests/rest/client/v2_alpha/test_register.py b/tests/rest/client/v2_alpha/test_register.py
index 67f7dc43c3..2d4ce871eb 100644
--- a/tests/rest/client/v2_alpha/test_register.py
+++ b/tests/rest/client/v2_alpha/test_register.py
@@ -735,8 +735,10 @@ class AccountValidityRenewalByEmailTestCase(unittest.HomeserverTestCase):
# Check that the HTML we're getting is the one we expect when reusing a
# token. The account expiration date should not have changed.
- expected_html = self.hs.config.account_validity_account_previously_renewed_template.render(
- expiration_ts=expiration_ts
+ expected_html = (
+ self.hs.config.account_validity_account_previously_renewed_template.render(
+ expiration_ts=expiration_ts
+ )
)
self.assertEqual(
channel.result["body"], expected_html.encode("utf8"), channel.result
diff --git a/tests/rest/client/v2_alpha/test_sync.py b/tests/rest/client/v2_alpha/test_sync.py
index 899f4902d7..8755bfb38a 100644
--- a/tests/rest/client/v2_alpha/test_sync.py
+++ b/tests/rest/client/v2_alpha/test_sync.py
@@ -350,7 +350,9 @@ class SyncKnockTestCase(
# Perform an initial sync for the knocking user.
channel = self.make_request(
- "GET", self.url % self.next_batch, access_token=self.tok,
+ "GET",
+ self.url % self.next_batch,
+ access_token=self.tok,
)
self.assertEqual(channel.code, 200, channel.json_body)
@@ -382,7 +384,9 @@ class SyncKnockTestCase(
# Check that /sync includes stripped state from the room
channel = self.make_request(
- "GET", self.url % self.next_batch, access_token=self.knocker_tok,
+ "GET",
+ self.url % self.next_batch,
+ access_token=self.knocker_tok,
)
self.assertEqual(channel.code, 200, channel.json_body)
diff --git a/tests/rulecheck/test_domainrulecheck.py b/tests/rulecheck/test_domainrulecheck.py
index 27e59e3891..3c70a9c8c0 100644
--- a/tests/rulecheck/test_domainrulecheck.py
+++ b/tests/rulecheck/test_domainrulecheck.py
@@ -284,8 +284,7 @@ class DomainRuleCheckerRoomTestCase(unittest.HomeserverTestCase):
)
def test_cannot_3pid_invite(self):
- """Test that unbound 3pid invites get rejected.
- """
+ """Test that unbound 3pid invites get rejected."""
channel = self._create_room(self.admin_access_token)
assert channel.result["code"] == b"200", channel.result
@@ -322,7 +321,9 @@ class DomainRuleCheckerRoomTestCase(unittest.HomeserverTestCase):
path = "/_matrix/client/r0/createRoom?access_token=%s" % (token,)
channel = self.make_request(
- "POST", path, content=json.dumps(content).encode("utf8"),
+ "POST",
+ path,
+ content=json.dumps(content).encode("utf8"),
)
return channel
|
