diff --git a/tests/handlers/test_appservice.py b/tests/handlers/test_appservice.py
index 6e0ec37963..072e6bbcdd 100644
--- a/tests/handlers/test_appservice.py
+++ b/tests/handlers/test_appservice.py
@@ -147,8 +147,8 @@ class AppServiceHandlerTestCase(unittest.TestCase):
self.mock_as_api.query_alias.assert_called_once_with(
interested_service, room_alias_str
)
- self.assertEquals(result.room_id, room_id)
- self.assertEquals(result.servers, servers)
+ self.assertEqual(result.room_id, room_id)
+ self.assertEqual(result.servers, servers)
def test_get_3pe_protocols_no_appservices(self):
self.mock_store.get_app_services.return_value = []
@@ -156,7 +156,7 @@ class AppServiceHandlerTestCase(unittest.TestCase):
defer.ensureDeferred(self.handler.get_3pe_protocols("my-protocol"))
)
self.mock_as_api.get_3pe_protocol.assert_not_called()
- self.assertEquals(response, {})
+ self.assertEqual(response, {})
def test_get_3pe_protocols_no_protocols(self):
service = self._mkservice(False, [])
@@ -165,7 +165,7 @@ class AppServiceHandlerTestCase(unittest.TestCase):
defer.ensureDeferred(self.handler.get_3pe_protocols())
)
self.mock_as_api.get_3pe_protocol.assert_not_called()
- self.assertEquals(response, {})
+ self.assertEqual(response, {})
def test_get_3pe_protocols_protocol_no_response(self):
service = self._mkservice(False, ["my-protocol"])
@@ -177,7 +177,7 @@ class AppServiceHandlerTestCase(unittest.TestCase):
self.mock_as_api.get_3pe_protocol.assert_called_once_with(
service, "my-protocol"
)
- self.assertEquals(response, {})
+ self.assertEqual(response, {})
def test_get_3pe_protocols_select_one_protocol(self):
service = self._mkservice(False, ["my-protocol"])
@@ -191,7 +191,7 @@ class AppServiceHandlerTestCase(unittest.TestCase):
self.mock_as_api.get_3pe_protocol.assert_called_once_with(
service, "my-protocol"
)
- self.assertEquals(
+ self.assertEqual(
response, {"my-protocol": {"x-protocol-data": 42, "instances": []}}
)
@@ -207,7 +207,7 @@ class AppServiceHandlerTestCase(unittest.TestCase):
self.mock_as_api.get_3pe_protocol.assert_called_once_with(
service, "my-protocol"
)
- self.assertEquals(
+ self.assertEqual(
response, {"my-protocol": {"x-protocol-data": 42, "instances": []}}
)
@@ -222,7 +222,7 @@ class AppServiceHandlerTestCase(unittest.TestCase):
defer.ensureDeferred(self.handler.get_3pe_protocols())
)
self.mock_as_api.get_3pe_protocol.assert_called()
- self.assertEquals(
+ self.assertEqual(
response,
{
"my-protocol": {"x-protocol-data": 42, "instances": []},
@@ -254,7 +254,7 @@ class AppServiceHandlerTestCase(unittest.TestCase):
defer.ensureDeferred(self.handler.get_3pe_protocols())
)
# It's expected that the second service's data doesn't appear in the response
- self.assertEquals(
+ self.assertEqual(
response,
{
"my-protocol": {
diff --git a/tests/handlers/test_directory.py b/tests/handlers/test_directory.py
index 65ab107d0e..6e403a87c5 100644
--- a/tests/handlers/test_directory.py
+++ b/tests/handlers/test_directory.py
@@ -63,7 +63,7 @@ class DirectoryTestCase(unittest.HomeserverTestCase):
result = self.get_success(self.handler.get_association(self.my_room))
- self.assertEquals({"room_id": "!8765qwer:test", "servers": ["test"]}, result)
+ self.assertEqual({"room_id": "!8765qwer:test", "servers": ["test"]}, result)
def test_get_remote_association(self):
self.mock_federation.make_query.return_value = make_awaitable(
@@ -72,7 +72,7 @@ class DirectoryTestCase(unittest.HomeserverTestCase):
result = self.get_success(self.handler.get_association(self.remote_room))
- self.assertEquals(
+ self.assertEqual(
{"room_id": "!8765qwer:test", "servers": ["test", "remote"]}, result
)
self.mock_federation.make_query.assert_called_with(
@@ -94,7 +94,7 @@ class DirectoryTestCase(unittest.HomeserverTestCase):
self.handler.on_directory_query({"room_alias": "#your-room:test"})
)
- self.assertEquals({"room_id": "!8765asdf:test", "servers": ["test"]}, response)
+ self.assertEqual({"room_id": "!8765asdf:test", "servers": ["test"]}, response)
class TestCreateAlias(unittest.HomeserverTestCase):
@@ -224,7 +224,7 @@ class TestDeleteAlias(unittest.HomeserverTestCase):
create_requester(self.test_user), self.room_alias
)
)
- self.assertEquals(self.room_id, result)
+ self.assertEqual(self.room_id, result)
# Confirm the alias is gone.
self.get_failure(
@@ -243,7 +243,7 @@ class TestDeleteAlias(unittest.HomeserverTestCase):
create_requester(self.admin_user), self.room_alias
)
)
- self.assertEquals(self.room_id, result)
+ self.assertEqual(self.room_id, result)
# Confirm the alias is gone.
self.get_failure(
@@ -269,7 +269,7 @@ class TestDeleteAlias(unittest.HomeserverTestCase):
create_requester(self.test_user), self.room_alias
)
)
- self.assertEquals(self.room_id, result)
+ self.assertEqual(self.room_id, result)
# Confirm the alias is gone.
self.get_failure(
@@ -411,7 +411,7 @@ class TestCreateAliasACL(unittest.HomeserverTestCase):
b"directory/room/%23test%3Atest",
{"room_id": room_id},
)
- self.assertEquals(403, channel.code, channel.result)
+ self.assertEqual(403, channel.code, channel.result)
def test_allowed(self):
room_id = self.helper.create_room_as(self.user_id)
@@ -421,7 +421,7 @@ class TestCreateAliasACL(unittest.HomeserverTestCase):
b"directory/room/%23unofficial_test%3Atest",
{"room_id": room_id},
)
- self.assertEquals(200, channel.code, channel.result)
+ self.assertEqual(200, channel.code, channel.result)
def test_denied_during_creation(self):
"""A room alias that is not allowed should be rejected during creation."""
@@ -443,8 +443,8 @@ class TestCreateAliasACL(unittest.HomeserverTestCase):
"GET",
b"directory/room/%23unofficial_test%3Atest",
)
- self.assertEquals(200, channel.code, channel.result)
- self.assertEquals(channel.json_body["room_id"], room_id)
+ self.assertEqual(200, channel.code, channel.result)
+ self.assertEqual(channel.json_body["room_id"], room_id)
class TestCreatePublishedRoomACL(unittest.HomeserverTestCase):
@@ -572,7 +572,7 @@ class TestRoomListSearchDisabled(unittest.HomeserverTestCase):
channel = self.make_request(
"PUT", b"directory/list/room/%s" % (room_id.encode("ascii"),), b"{}"
)
- self.assertEquals(200, channel.code, channel.result)
+ self.assertEqual(200, channel.code, channel.result)
self.room_list_handler = hs.get_room_list_handler()
self.directory_handler = hs.get_directory_handler()
@@ -585,7 +585,7 @@ class TestRoomListSearchDisabled(unittest.HomeserverTestCase):
# Room list is enabled so we should get some results
channel = self.make_request("GET", b"publicRooms")
- self.assertEquals(200, channel.code, channel.result)
+ self.assertEqual(200, channel.code, channel.result)
self.assertTrue(len(channel.json_body["chunk"]) > 0)
self.room_list_handler.enable_room_list_search = False
@@ -593,7 +593,7 @@ class TestRoomListSearchDisabled(unittest.HomeserverTestCase):
# Room list disabled so we should get no results
channel = self.make_request("GET", b"publicRooms")
- self.assertEquals(200, channel.code, channel.result)
+ self.assertEqual(200, channel.code, channel.result)
self.assertTrue(len(channel.json_body["chunk"]) == 0)
# Room list disabled so we shouldn't be allowed to publish rooms
@@ -601,4 +601,4 @@ class TestRoomListSearchDisabled(unittest.HomeserverTestCase):
channel = self.make_request(
"PUT", b"directory/list/room/%s" % (room_id.encode("ascii"),), b"{}"
)
- self.assertEquals(403, channel.code, channel.result)
+ self.assertEqual(403, channel.code, channel.result)
diff --git a/tests/handlers/test_presence.py b/tests/handlers/test_presence.py
index 61d28603ae..6ddec9ecf1 100644
--- a/tests/handlers/test_presence.py
+++ b/tests/handlers/test_presence.py
@@ -61,11 +61,11 @@ class PresenceUpdateTestCase(unittest.HomeserverTestCase):
self.assertTrue(persist_and_notify)
self.assertTrue(state.currently_active)
- self.assertEquals(new_state.state, state.state)
- self.assertEquals(new_state.status_msg, state.status_msg)
- self.assertEquals(state.last_federation_update_ts, now)
+ self.assertEqual(new_state.state, state.state)
+ self.assertEqual(new_state.status_msg, state.status_msg)
+ self.assertEqual(state.last_federation_update_ts, now)
- self.assertEquals(wheel_timer.insert.call_count, 3)
+ self.assertEqual(wheel_timer.insert.call_count, 3)
wheel_timer.insert.assert_has_calls(
[
call(now=now, obj=user_id, then=new_state.last_active_ts + IDLE_TIMER),
@@ -104,11 +104,11 @@ class PresenceUpdateTestCase(unittest.HomeserverTestCase):
self.assertFalse(persist_and_notify)
self.assertTrue(federation_ping)
self.assertTrue(state.currently_active)
- self.assertEquals(new_state.state, state.state)
- self.assertEquals(new_state.status_msg, state.status_msg)
- self.assertEquals(state.last_federation_update_ts, now)
+ self.assertEqual(new_state.state, state.state)
+ self.assertEqual(new_state.status_msg, state.status_msg)
+ self.assertEqual(state.last_federation_update_ts, now)
- self.assertEquals(wheel_timer.insert.call_count, 3)
+ self.assertEqual(wheel_timer.insert.call_count, 3)
wheel_timer.insert.assert_has_calls(
[
call(now=now, obj=user_id, then=new_state.last_active_ts + IDLE_TIMER),
@@ -149,11 +149,11 @@ class PresenceUpdateTestCase(unittest.HomeserverTestCase):
self.assertFalse(persist_and_notify)
self.assertTrue(federation_ping)
self.assertTrue(state.currently_active)
- self.assertEquals(new_state.state, state.state)
- self.assertEquals(new_state.status_msg, state.status_msg)
- self.assertEquals(state.last_federation_update_ts, now)
+ self.assertEqual(new_state.state, state.state)
+ self.assertEqual(new_state.status_msg, state.status_msg)
+ self.assertEqual(state.last_federation_update_ts, now)
- self.assertEquals(wheel_timer.insert.call_count, 3)
+ self.assertEqual(wheel_timer.insert.call_count, 3)
wheel_timer.insert.assert_has_calls(
[
call(now=now, obj=user_id, then=new_state.last_active_ts + IDLE_TIMER),
@@ -191,11 +191,11 @@ class PresenceUpdateTestCase(unittest.HomeserverTestCase):
self.assertTrue(persist_and_notify)
self.assertFalse(state.currently_active)
- self.assertEquals(new_state.state, state.state)
- self.assertEquals(new_state.status_msg, state.status_msg)
- self.assertEquals(state.last_federation_update_ts, now)
+ self.assertEqual(new_state.state, state.state)
+ self.assertEqual(new_state.status_msg, state.status_msg)
+ self.assertEqual(state.last_federation_update_ts, now)
- self.assertEquals(wheel_timer.insert.call_count, 2)
+ self.assertEqual(wheel_timer.insert.call_count, 2)
wheel_timer.insert.assert_has_calls(
[
call(now=now, obj=user_id, then=new_state.last_active_ts + IDLE_TIMER),
@@ -227,10 +227,10 @@ class PresenceUpdateTestCase(unittest.HomeserverTestCase):
self.assertFalse(persist_and_notify)
self.assertFalse(federation_ping)
self.assertFalse(state.currently_active)
- self.assertEquals(new_state.state, state.state)
- self.assertEquals(new_state.status_msg, state.status_msg)
+ self.assertEqual(new_state.state, state.state)
+ self.assertEqual(new_state.status_msg, state.status_msg)
- self.assertEquals(wheel_timer.insert.call_count, 1)
+ self.assertEqual(wheel_timer.insert.call_count, 1)
wheel_timer.insert.assert_has_calls(
[
call(
@@ -259,10 +259,10 @@ class PresenceUpdateTestCase(unittest.HomeserverTestCase):
)
self.assertTrue(persist_and_notify)
- self.assertEquals(new_state.state, state.state)
- self.assertEquals(state.last_federation_update_ts, now)
+ self.assertEqual(new_state.state, state.state)
+ self.assertEqual(state.last_federation_update_ts, now)
- self.assertEquals(wheel_timer.insert.call_count, 0)
+ self.assertEqual(wheel_timer.insert.call_count, 0)
def test_online_to_idle(self):
wheel_timer = Mock()
@@ -281,12 +281,12 @@ class PresenceUpdateTestCase(unittest.HomeserverTestCase):
)
self.assertTrue(persist_and_notify)
- self.assertEquals(new_state.state, state.state)
- self.assertEquals(state.last_federation_update_ts, now)
- self.assertEquals(new_state.state, state.state)
- self.assertEquals(new_state.status_msg, state.status_msg)
+ self.assertEqual(new_state.state, state.state)
+ self.assertEqual(state.last_federation_update_ts, now)
+ self.assertEqual(new_state.state, state.state)
+ self.assertEqual(new_state.status_msg, state.status_msg)
- self.assertEquals(wheel_timer.insert.call_count, 1)
+ self.assertEqual(wheel_timer.insert.call_count, 1)
wheel_timer.insert.assert_has_calls(
[
call(
@@ -357,8 +357,8 @@ class PresenceTimeoutTestCase(unittest.TestCase):
new_state = handle_timeout(state, is_mine=True, syncing_user_ids=set(), now=now)
self.assertIsNotNone(new_state)
- self.assertEquals(new_state.state, PresenceState.UNAVAILABLE)
- self.assertEquals(new_state.status_msg, status_msg)
+ self.assertEqual(new_state.state, PresenceState.UNAVAILABLE)
+ self.assertEqual(new_state.status_msg, status_msg)
def test_busy_no_idle(self):
"""
@@ -380,8 +380,8 @@ class PresenceTimeoutTestCase(unittest.TestCase):
new_state = handle_timeout(state, is_mine=True, syncing_user_ids=set(), now=now)
self.assertIsNotNone(new_state)
- self.assertEquals(new_state.state, PresenceState.BUSY)
- self.assertEquals(new_state.status_msg, status_msg)
+ self.assertEqual(new_state.state, PresenceState.BUSY)
+ self.assertEqual(new_state.status_msg, status_msg)
def test_sync_timeout(self):
user_id = "@foo:bar"
@@ -399,8 +399,8 @@ class PresenceTimeoutTestCase(unittest.TestCase):
new_state = handle_timeout(state, is_mine=True, syncing_user_ids=set(), now=now)
self.assertIsNotNone(new_state)
- self.assertEquals(new_state.state, PresenceState.OFFLINE)
- self.assertEquals(new_state.status_msg, status_msg)
+ self.assertEqual(new_state.state, PresenceState.OFFLINE)
+ self.assertEqual(new_state.status_msg, status_msg)
def test_sync_online(self):
user_id = "@foo:bar"
@@ -420,8 +420,8 @@ class PresenceTimeoutTestCase(unittest.TestCase):
)
self.assertIsNotNone(new_state)
- self.assertEquals(new_state.state, PresenceState.ONLINE)
- self.assertEquals(new_state.status_msg, status_msg)
+ self.assertEqual(new_state.state, PresenceState.ONLINE)
+ self.assertEqual(new_state.status_msg, status_msg)
def test_federation_ping(self):
user_id = "@foo:bar"
@@ -440,7 +440,7 @@ class PresenceTimeoutTestCase(unittest.TestCase):
new_state = handle_timeout(state, is_mine=True, syncing_user_ids=set(), now=now)
self.assertIsNotNone(new_state)
- self.assertEquals(state, new_state)
+ self.assertEqual(state, new_state)
def test_no_timeout(self):
user_id = "@foo:bar"
@@ -477,8 +477,8 @@ class PresenceTimeoutTestCase(unittest.TestCase):
)
self.assertIsNotNone(new_state)
- self.assertEquals(new_state.state, PresenceState.OFFLINE)
- self.assertEquals(new_state.status_msg, status_msg)
+ self.assertEqual(new_state.state, PresenceState.OFFLINE)
+ self.assertEqual(new_state.status_msg, status_msg)
def test_last_active(self):
user_id = "@foo:bar"
@@ -497,7 +497,7 @@ class PresenceTimeoutTestCase(unittest.TestCase):
new_state = handle_timeout(state, is_mine=True, syncing_user_ids=set(), now=now)
self.assertIsNotNone(new_state)
- self.assertEquals(state, new_state)
+ self.assertEqual(state, new_state)
class PresenceHandlerTestCase(unittest.HomeserverTestCase):
diff --git a/tests/handlers/test_profile.py b/tests/handlers/test_profile.py
index 69e299fc17..972cbac6e4 100644
--- a/tests/handlers/test_profile.py
+++ b/tests/handlers/test_profile.py
@@ -65,7 +65,7 @@ class ProfileTestCase(unittest.HomeserverTestCase):
displayname = self.get_success(self.handler.get_displayname(self.frank))
- self.assertEquals("Frank", displayname)
+ self.assertEqual("Frank", displayname)
def test_set_my_name(self):
self.get_success(
@@ -74,7 +74,7 @@ class ProfileTestCase(unittest.HomeserverTestCase):
)
)
- self.assertEquals(
+ self.assertEqual(
(
self.get_success(
self.store.get_profile_displayname(self.frank.localpart)
@@ -90,7 +90,7 @@ class ProfileTestCase(unittest.HomeserverTestCase):
)
)
- self.assertEquals(
+ self.assertEqual(
(
self.get_success(
self.store.get_profile_displayname(self.frank.localpart)
@@ -118,7 +118,7 @@ class ProfileTestCase(unittest.HomeserverTestCase):
self.store.set_profile_displayname(self.frank.localpart, "Frank")
)
- self.assertEquals(
+ self.assertEqual(
(
self.get_success(
self.store.get_profile_displayname(self.frank.localpart)
@@ -150,7 +150,7 @@ class ProfileTestCase(unittest.HomeserverTestCase):
displayname = self.get_success(self.handler.get_displayname(self.alice))
- self.assertEquals(displayname, "Alice")
+ self.assertEqual(displayname, "Alice")
self.mock_federation.make_query.assert_called_with(
destination="remote",
query_type="profile",
@@ -172,7 +172,7 @@ class ProfileTestCase(unittest.HomeserverTestCase):
)
)
- self.assertEquals({"displayname": "Caroline"}, response)
+ self.assertEqual({"displayname": "Caroline"}, response)
def test_get_my_avatar(self):
self.get_success(
@@ -182,7 +182,7 @@ class ProfileTestCase(unittest.HomeserverTestCase):
)
avatar_url = self.get_success(self.handler.get_avatar_url(self.frank))
- self.assertEquals("http://my.server/me.png", avatar_url)
+ self.assertEqual("http://my.server/me.png", avatar_url)
def test_set_my_avatar(self):
self.get_success(
@@ -193,7 +193,7 @@ class ProfileTestCase(unittest.HomeserverTestCase):
)
)
- self.assertEquals(
+ self.assertEqual(
(self.get_success(self.store.get_profile_avatar_url(self.frank.localpart))),
"http://my.server/pic.gif",
)
@@ -207,7 +207,7 @@ class ProfileTestCase(unittest.HomeserverTestCase):
)
)
- self.assertEquals(
+ self.assertEqual(
(self.get_success(self.store.get_profile_avatar_url(self.frank.localpart))),
"http://my.server/me.png",
)
@@ -235,7 +235,7 @@ class ProfileTestCase(unittest.HomeserverTestCase):
)
)
- self.assertEquals(
+ self.assertEqual(
(self.get_success(self.store.get_profile_avatar_url(self.frank.localpart))),
"http://my.server/me.png",
)
diff --git a/tests/handlers/test_receipts.py b/tests/handlers/test_receipts.py
index 5de89c873b..5081b97573 100644
--- a/tests/handlers/test_receipts.py
+++ b/tests/handlers/test_receipts.py
@@ -314,4 +314,4 @@ class ReceiptsTestCase(unittest.HomeserverTestCase):
):
"""Tests that the _filter_out_hidden returns the expected output"""
filtered_events = self.event_source.filter_out_hidden(events, "@me:server.org")
- self.assertEquals(filtered_events, expected_output)
+ self.assertEqual(filtered_events, expected_output)
diff --git a/tests/handlers/test_register.py b/tests/handlers/test_register.py
index 51ee667ab4..45fd30cf43 100644
--- a/tests/handlers/test_register.py
+++ b/tests/handlers/test_register.py
@@ -167,7 +167,7 @@ class RegistrationTestCase(unittest.HomeserverTestCase):
result_user_id, result_token = self.get_success(
self.get_or_create_user(requester, frank.localpart, "Frankie")
)
- self.assertEquals(result_user_id, user_id)
+ self.assertEqual(result_user_id, user_id)
self.assertIsInstance(result_token, str)
self.assertGreater(len(result_token), 20)
@@ -183,7 +183,7 @@ class RegistrationTestCase(unittest.HomeserverTestCase):
result_user_id, result_token = self.get_success(
self.get_or_create_user(requester, local_part, None)
)
- self.assertEquals(result_user_id, user_id)
+ self.assertEqual(result_user_id, user_id)
self.assertTrue(result_token is not None)
@override_config({"limit_usage_by_mau": False})
diff --git a/tests/handlers/test_sync.py b/tests/handlers/test_sync.py
index 66b0bd4d1a..3aedc0767b 100644
--- a/tests/handlers/test_sync.py
+++ b/tests/handlers/test_sync.py
@@ -69,7 +69,7 @@ class SyncTestCase(tests.unittest.HomeserverTestCase):
self.sync_handler.wait_for_sync_for_user(requester, sync_config),
ResourceLimitError,
)
- self.assertEquals(e.value.errcode, Codes.RESOURCE_LIMIT_EXCEEDED)
+ self.assertEqual(e.value.errcode, Codes.RESOURCE_LIMIT_EXCEEDED)
self.auth_blocking._hs_disabled = False
@@ -80,7 +80,7 @@ class SyncTestCase(tests.unittest.HomeserverTestCase):
self.sync_handler.wait_for_sync_for_user(requester, sync_config),
ResourceLimitError,
)
- self.assertEquals(e.value.errcode, Codes.RESOURCE_LIMIT_EXCEEDED)
+ self.assertEqual(e.value.errcode, Codes.RESOURCE_LIMIT_EXCEEDED)
def test_unknown_room_version(self):
"""
@@ -122,7 +122,7 @@ class SyncTestCase(tests.unittest.HomeserverTestCase):
b"{}",
tok,
)
- self.assertEquals(200, channel.code, channel.result)
+ self.assertEqual(200, channel.code, channel.result)
# The rooms should appear in the sync response.
result = self.get_success(
diff --git a/tests/handlers/test_typing.py b/tests/handlers/test_typing.py
index e461e03599..f91a80b9fa 100644
--- a/tests/handlers/test_typing.py
+++ b/tests/handlers/test_typing.py
@@ -156,7 +156,7 @@ class TypingNotificationsTestCase(unittest.HomeserverTestCase):
def test_started_typing_local(self):
self.room_members = [U_APPLE, U_BANANA]
- self.assertEquals(self.event_source.get_current_key(), 0)
+ self.assertEqual(self.event_source.get_current_key(), 0)
self.get_success(
self.handler.started_typing(
@@ -169,13 +169,13 @@ class TypingNotificationsTestCase(unittest.HomeserverTestCase):
self.on_new_event.assert_has_calls([call("typing_key", 1, rooms=[ROOM_ID])])
- self.assertEquals(self.event_source.get_current_key(), 1)
+ self.assertEqual(self.event_source.get_current_key(), 1)
events = self.get_success(
self.event_source.get_new_events(
user=U_APPLE, from_key=0, limit=None, room_ids=[ROOM_ID], is_guest=False
)
)
- self.assertEquals(
+ self.assertEqual(
events[0],
[
{
@@ -220,7 +220,7 @@ class TypingNotificationsTestCase(unittest.HomeserverTestCase):
def test_started_typing_remote_recv(self):
self.room_members = [U_APPLE, U_ONION]
- self.assertEquals(self.event_source.get_current_key(), 0)
+ self.assertEqual(self.event_source.get_current_key(), 0)
channel = self.make_request(
"PUT",
@@ -239,13 +239,13 @@ class TypingNotificationsTestCase(unittest.HomeserverTestCase):
self.on_new_event.assert_has_calls([call("typing_key", 1, rooms=[ROOM_ID])])
- self.assertEquals(self.event_source.get_current_key(), 1)
+ self.assertEqual(self.event_source.get_current_key(), 1)
events = self.get_success(
self.event_source.get_new_events(
user=U_APPLE, from_key=0, limit=None, room_ids=[ROOM_ID], is_guest=False
)
)
- self.assertEquals(
+ self.assertEqual(
events[0],
[
{
@@ -259,7 +259,7 @@ class TypingNotificationsTestCase(unittest.HomeserverTestCase):
def test_started_typing_remote_recv_not_in_room(self):
self.room_members = [U_APPLE, U_ONION]
- self.assertEquals(self.event_source.get_current_key(), 0)
+ self.assertEqual(self.event_source.get_current_key(), 0)
channel = self.make_request(
"PUT",
@@ -278,7 +278,7 @@ class TypingNotificationsTestCase(unittest.HomeserverTestCase):
self.on_new_event.assert_not_called()
- self.assertEquals(self.event_source.get_current_key(), 0)
+ self.assertEqual(self.event_source.get_current_key(), 0)
events = self.get_success(
self.event_source.get_new_events(
user=U_APPLE,
@@ -288,8 +288,8 @@ class TypingNotificationsTestCase(unittest.HomeserverTestCase):
is_guest=False,
)
)
- self.assertEquals(events[0], [])
- self.assertEquals(events[1], 0)
+ self.assertEqual(events[0], [])
+ self.assertEqual(events[1], 0)
@override_config({"send_federation": True})
def test_stopped_typing(self):
@@ -302,7 +302,7 @@ class TypingNotificationsTestCase(unittest.HomeserverTestCase):
self.handler._member_typing_until[member] = 1002000
self.handler._room_typing[ROOM_ID] = {U_APPLE.to_string()}
- self.assertEquals(self.event_source.get_current_key(), 0)
+ self.assertEqual(self.event_source.get_current_key(), 0)
self.get_success(
self.handler.stopped_typing(
@@ -332,13 +332,13 @@ class TypingNotificationsTestCase(unittest.HomeserverTestCase):
try_trailing_slash_on_400=True,
)
- self.assertEquals(self.event_source.get_current_key(), 1)
+ self.assertEqual(self.event_source.get_current_key(), 1)
events = self.get_success(
self.event_source.get_new_events(
user=U_APPLE, from_key=0, limit=None, room_ids=[ROOM_ID], is_guest=False
)
)
- self.assertEquals(
+ self.assertEqual(
events[0],
[{"type": "m.typing", "room_id": ROOM_ID, "content": {"user_ids": []}}],
)
@@ -346,7 +346,7 @@ class TypingNotificationsTestCase(unittest.HomeserverTestCase):
def test_typing_timeout(self):
self.room_members = [U_APPLE, U_BANANA]
- self.assertEquals(self.event_source.get_current_key(), 0)
+ self.assertEqual(self.event_source.get_current_key(), 0)
self.get_success(
self.handler.started_typing(
@@ -360,7 +360,7 @@ class TypingNotificationsTestCase(unittest.HomeserverTestCase):
self.on_new_event.assert_has_calls([call("typing_key", 1, rooms=[ROOM_ID])])
self.on_new_event.reset_mock()
- self.assertEquals(self.event_source.get_current_key(), 1)
+ self.assertEqual(self.event_source.get_current_key(), 1)
events = self.get_success(
self.event_source.get_new_events(
user=U_APPLE,
@@ -370,7 +370,7 @@ class TypingNotificationsTestCase(unittest.HomeserverTestCase):
is_guest=False,
)
)
- self.assertEquals(
+ self.assertEqual(
events[0],
[
{
@@ -385,7 +385,7 @@ class TypingNotificationsTestCase(unittest.HomeserverTestCase):
self.on_new_event.assert_has_calls([call("typing_key", 2, rooms=[ROOM_ID])])
- self.assertEquals(self.event_source.get_current_key(), 2)
+ self.assertEqual(self.event_source.get_current_key(), 2)
events = self.get_success(
self.event_source.get_new_events(
user=U_APPLE,
@@ -395,7 +395,7 @@ class TypingNotificationsTestCase(unittest.HomeserverTestCase):
is_guest=False,
)
)
- self.assertEquals(
+ self.assertEqual(
events[0],
[{"type": "m.typing", "room_id": ROOM_ID, "content": {"user_ids": []}}],
)
@@ -414,7 +414,7 @@ class TypingNotificationsTestCase(unittest.HomeserverTestCase):
self.on_new_event.assert_has_calls([call("typing_key", 3, rooms=[ROOM_ID])])
self.on_new_event.reset_mock()
- self.assertEquals(self.event_source.get_current_key(), 3)
+ self.assertEqual(self.event_source.get_current_key(), 3)
events = self.get_success(
self.event_source.get_new_events(
user=U_APPLE,
@@ -424,7 +424,7 @@ class TypingNotificationsTestCase(unittest.HomeserverTestCase):
is_guest=False,
)
)
- self.assertEquals(
+ self.assertEqual(
events[0],
[
{
diff --git a/tests/handlers/test_user_directory.py b/tests/handlers/test_user_directory.py
index e159169e22..92012cd6f7 100644
--- a/tests/handlers/test_user_directory.py
+++ b/tests/handlers/test_user_directory.py
@@ -1042,7 +1042,7 @@ class TestUserDirSearchDisabled(unittest.HomeserverTestCase):
b'{"search_term":"user2"}',
access_token=u1_token,
)
- self.assertEquals(200, channel.code, channel.result)
+ self.assertEqual(200, channel.code, channel.result)
self.assertTrue(len(channel.json_body["results"]) > 0)
# Disable user directory and check search returns nothing
@@ -1053,5 +1053,5 @@ class TestUserDirSearchDisabled(unittest.HomeserverTestCase):
b'{"search_term":"user2"}',
access_token=u1_token,
)
- self.assertEquals(200, channel.code, channel.result)
+ self.assertEqual(200, channel.code, channel.result)
self.assertTrue(len(channel.json_body["results"]) == 0)
|
