diff --git a/tests/storage/databases/main/test_events_worker.py b/tests/storage/databases/main/test_events_worker.py
index 59def6e59c..1f6a9eb07b 100644
--- a/tests/storage/databases/main/test_events_worker.py
+++ b/tests/storage/databases/main/test_events_worker.py
@@ -88,18 +88,18 @@ class HaveSeenEventsTestCase(unittest.HomeserverTestCase):
res = self.get_success(
self.store.have_seen_events("room1", ["event10", "event19"])
)
- self.assertEquals(res, {"event10"})
+ self.assertEqual(res, {"event10"})
# that should result in a single db query
- self.assertEquals(ctx.get_resource_usage().db_txn_count, 1)
+ self.assertEqual(ctx.get_resource_usage().db_txn_count, 1)
# a second lookup of the same events should cause no queries
with LoggingContext(name="test") as ctx:
res = self.get_success(
self.store.have_seen_events("room1", ["event10", "event19"])
)
- self.assertEquals(res, {"event10"})
- self.assertEquals(ctx.get_resource_usage().db_txn_count, 0)
+ self.assertEqual(res, {"event10"})
+ self.assertEqual(ctx.get_resource_usage().db_txn_count, 0)
def test_query_via_event_cache(self):
# fetch an event into the event cache
@@ -108,8 +108,8 @@ class HaveSeenEventsTestCase(unittest.HomeserverTestCase):
# looking it up should now cause no db hits
with LoggingContext(name="test") as ctx:
res = self.get_success(self.store.have_seen_events("room1", ["event10"]))
- self.assertEquals(res, {"event10"})
- self.assertEquals(ctx.get_resource_usage().db_txn_count, 0)
+ self.assertEqual(res, {"event10"})
+ self.assertEqual(ctx.get_resource_usage().db_txn_count, 0)
class EventCacheTestCase(unittest.HomeserverTestCase):
diff --git a/tests/storage/test_appservice.py b/tests/storage/test_appservice.py
index d2f654214e..ee599f4336 100644
--- a/tests/storage/test_appservice.py
+++ b/tests/storage/test_appservice.py
@@ -88,21 +88,21 @@ class ApplicationServiceStoreTestCase(unittest.HomeserverTestCase):
def test_retrieve_unknown_service_token(self) -> None:
service = self.store.get_app_service_by_token("invalid_token")
- self.assertEquals(service, None)
+ self.assertEqual(service, None)
def test_retrieval_of_service(self) -> None:
stored_service = self.store.get_app_service_by_token(self.as_token)
assert stored_service is not None
- self.assertEquals(stored_service.token, self.as_token)
- self.assertEquals(stored_service.id, self.as_id)
- self.assertEquals(stored_service.url, self.as_url)
- self.assertEquals(stored_service.namespaces[ApplicationService.NS_ALIASES], [])
- self.assertEquals(stored_service.namespaces[ApplicationService.NS_ROOMS], [])
- self.assertEquals(stored_service.namespaces[ApplicationService.NS_USERS], [])
+ self.assertEqual(stored_service.token, self.as_token)
+ self.assertEqual(stored_service.id, self.as_id)
+ self.assertEqual(stored_service.url, self.as_url)
+ self.assertEqual(stored_service.namespaces[ApplicationService.NS_ALIASES], [])
+ self.assertEqual(stored_service.namespaces[ApplicationService.NS_ROOMS], [])
+ self.assertEqual(stored_service.namespaces[ApplicationService.NS_USERS], [])
def test_retrieval_of_all_services(self) -> None:
services = self.store.get_app_services()
- self.assertEquals(len(services), 3)
+ self.assertEqual(len(services), 3)
class ApplicationServiceTransactionStoreTestCase(unittest.HomeserverTestCase):
@@ -182,7 +182,7 @@ class ApplicationServiceTransactionStoreTestCase(unittest.HomeserverTestCase):
) -> None:
service = Mock(id="999")
state = self.get_success(self.store.get_appservice_state(service))
- self.assertEquals(None, state)
+ self.assertEqual(None, state)
def test_get_appservice_state_up(
self,
@@ -194,7 +194,7 @@ class ApplicationServiceTransactionStoreTestCase(unittest.HomeserverTestCase):
state = self.get_success(
defer.ensureDeferred(self.store.get_appservice_state(service))
)
- self.assertEquals(ApplicationServiceState.UP, state)
+ self.assertEqual(ApplicationServiceState.UP, state)
def test_get_appservice_state_down(
self,
@@ -210,7 +210,7 @@ class ApplicationServiceTransactionStoreTestCase(unittest.HomeserverTestCase):
)
service = Mock(id=self.as_list[1]["id"])
state = self.get_success(self.store.get_appservice_state(service))
- self.assertEquals(ApplicationServiceState.DOWN, state)
+ self.assertEqual(ApplicationServiceState.DOWN, state)
def test_get_appservices_by_state_none(
self,
@@ -218,7 +218,7 @@ class ApplicationServiceTransactionStoreTestCase(unittest.HomeserverTestCase):
services = self.get_success(
self.store.get_appservices_by_state(ApplicationServiceState.DOWN)
)
- self.assertEquals(0, len(services))
+ self.assertEqual(0, len(services))
def test_set_appservices_state_down(
self,
@@ -235,7 +235,7 @@ class ApplicationServiceTransactionStoreTestCase(unittest.HomeserverTestCase):
(ApplicationServiceState.DOWN.value,),
)
)
- self.assertEquals(service.id, rows[0][0])
+ self.assertEqual(service.id, rows[0][0])
def test_set_appservices_state_multiple_up(
self,
@@ -258,7 +258,7 @@ class ApplicationServiceTransactionStoreTestCase(unittest.HomeserverTestCase):
(ApplicationServiceState.UP.value,),
)
)
- self.assertEquals(service.id, rows[0][0])
+ self.assertEqual(service.id, rows[0][0])
def test_create_appservice_txn_first(
self,
@@ -270,9 +270,9 @@ class ApplicationServiceTransactionStoreTestCase(unittest.HomeserverTestCase):
self.store.create_appservice_txn(service, events, [], [], {}, {})
)
)
- self.assertEquals(txn.id, 1)
- self.assertEquals(txn.events, events)
- self.assertEquals(txn.service, service)
+ self.assertEqual(txn.id, 1)
+ self.assertEqual(txn.events, events)
+ self.assertEqual(txn.service, service)
def test_create_appservice_txn_older_last_txn(
self,
@@ -285,9 +285,9 @@ class ApplicationServiceTransactionStoreTestCase(unittest.HomeserverTestCase):
txn = self.get_success(
self.store.create_appservice_txn(service, events, [], [], {}, {})
)
- self.assertEquals(txn.id, 9646)
- self.assertEquals(txn.events, events)
- self.assertEquals(txn.service, service)
+ self.assertEqual(txn.id, 9646)
+ self.assertEqual(txn.events, events)
+ self.assertEqual(txn.service, service)
def test_create_appservice_txn_up_to_date_last_txn(
self,
@@ -298,9 +298,9 @@ class ApplicationServiceTransactionStoreTestCase(unittest.HomeserverTestCase):
txn = self.get_success(
self.store.create_appservice_txn(service, events, [], [], {}, {})
)
- self.assertEquals(txn.id, 9644)
- self.assertEquals(txn.events, events)
- self.assertEquals(txn.service, service)
+ self.assertEqual(txn.id, 9644)
+ self.assertEqual(txn.events, events)
+ self.assertEqual(txn.service, service)
def test_create_appservice_txn_up_fuzzing(
self,
@@ -322,9 +322,9 @@ class ApplicationServiceTransactionStoreTestCase(unittest.HomeserverTestCase):
txn = self.get_success(
self.store.create_appservice_txn(service, events, [], [], {}, {})
)
- self.assertEquals(txn.id, 9644)
- self.assertEquals(txn.events, events)
- self.assertEquals(txn.service, service)
+ self.assertEqual(txn.id, 9644)
+ self.assertEqual(txn.events, events)
+ self.assertEqual(txn.service, service)
def test_complete_appservice_txn_first_txn(
self,
@@ -346,8 +346,8 @@ class ApplicationServiceTransactionStoreTestCase(unittest.HomeserverTestCase):
(service.id,),
)
)
- self.assertEquals(1, len(res))
- self.assertEquals(txn_id, res[0][0])
+ self.assertEqual(1, len(res))
+ self.assertEqual(txn_id, res[0][0])
res = self.get_success(
self.db_pool.runQuery(
@@ -357,7 +357,7 @@ class ApplicationServiceTransactionStoreTestCase(unittest.HomeserverTestCase):
(txn_id,),
)
)
- self.assertEquals(0, len(res))
+ self.assertEqual(0, len(res))
def test_complete_appservice_txn_existing_in_state_table(
self,
@@ -379,9 +379,9 @@ class ApplicationServiceTransactionStoreTestCase(unittest.HomeserverTestCase):
(service.id,),
)
)
- self.assertEquals(1, len(res))
- self.assertEquals(txn_id, res[0][0])
- self.assertEquals(ApplicationServiceState.UP.value, res[0][1])
+ self.assertEqual(1, len(res))
+ self.assertEqual(txn_id, res[0][0])
+ self.assertEqual(ApplicationServiceState.UP.value, res[0][1])
res = self.get_success(
self.db_pool.runQuery(
@@ -391,7 +391,7 @@ class ApplicationServiceTransactionStoreTestCase(unittest.HomeserverTestCase):
(txn_id,),
)
)
- self.assertEquals(0, len(res))
+ self.assertEqual(0, len(res))
def test_get_oldest_unsent_txn_none(
self,
@@ -399,7 +399,7 @@ class ApplicationServiceTransactionStoreTestCase(unittest.HomeserverTestCase):
service = Mock(id=self.as_list[0]["id"])
txn = self.get_success(self.store.get_oldest_unsent_txn(service))
- self.assertEquals(None, txn)
+ self.assertEqual(None, txn)
def test_get_oldest_unsent_txn(self) -> None:
service = Mock(id=self.as_list[0]["id"])
@@ -416,9 +416,9 @@ class ApplicationServiceTransactionStoreTestCase(unittest.HomeserverTestCase):
self.get_success(self._insert_txn(service.id, 12, other_events))
txn = self.get_success(self.store.get_oldest_unsent_txn(service))
- self.assertEquals(service, txn.service)
- self.assertEquals(10, txn.id)
- self.assertEquals(events, txn.events)
+ self.assertEqual(service, txn.service)
+ self.assertEqual(10, txn.id)
+ self.assertEqual(events, txn.events)
def test_get_appservices_by_state_single(
self,
@@ -433,8 +433,8 @@ class ApplicationServiceTransactionStoreTestCase(unittest.HomeserverTestCase):
services = self.get_success(
self.store.get_appservices_by_state(ApplicationServiceState.DOWN)
)
- self.assertEquals(1, len(services))
- self.assertEquals(self.as_list[0]["id"], services[0].id)
+ self.assertEqual(1, len(services))
+ self.assertEqual(self.as_list[0]["id"], services[0].id)
def test_get_appservices_by_state_multiple(
self,
@@ -455,8 +455,8 @@ class ApplicationServiceTransactionStoreTestCase(unittest.HomeserverTestCase):
services = self.get_success(
self.store.get_appservices_by_state(ApplicationServiceState.DOWN)
)
- self.assertEquals(2, len(services))
- self.assertEquals(
+ self.assertEqual(2, len(services))
+ self.assertEqual(
{self.as_list[2]["id"], self.as_list[0]["id"]},
{services[0].id, services[1].id},
)
@@ -476,12 +476,12 @@ class ApplicationServiceStoreTypeStreamIds(unittest.HomeserverTestCase):
value = self.get_success(
self.store.get_type_stream_id_for_appservice(self.service, "read_receipt")
)
- self.assertEquals(value, 0)
+ self.assertEqual(value, 0)
value = self.get_success(
self.store.get_type_stream_id_for_appservice(self.service, "presence")
)
- self.assertEquals(value, 0)
+ self.assertEqual(value, 0)
def test_get_type_stream_id_for_appservice_invalid_type(self) -> None:
self.get_failure(
diff --git a/tests/storage/test_base.py b/tests/storage/test_base.py
index 3e4f0579c9..a8ffb52c05 100644
--- a/tests/storage/test_base.py
+++ b/tests/storage/test_base.py
@@ -103,7 +103,7 @@ class SQLBaseStoreTestCase(unittest.TestCase):
)
)
- self.assertEquals("Value", value)
+ self.assertEqual("Value", value)
self.mock_txn.execute.assert_called_with(
"SELECT retcol FROM tablename WHERE keycol = ?", ["TheKey"]
)
@@ -121,7 +121,7 @@ class SQLBaseStoreTestCase(unittest.TestCase):
)
)
- self.assertEquals({"colA": 1, "colB": 2, "colC": 3}, ret)
+ self.assertEqual({"colA": 1, "colB": 2, "colC": 3}, ret)
self.mock_txn.execute.assert_called_with(
"SELECT colA, colB, colC FROM tablename WHERE keycol = ?", ["TheKey"]
)
@@ -154,7 +154,7 @@ class SQLBaseStoreTestCase(unittest.TestCase):
)
)
- self.assertEquals([{"colA": 1}, {"colA": 2}, {"colA": 3}], ret)
+ self.assertEqual([{"colA": 1}, {"colA": 2}, {"colA": 3}], ret)
self.mock_txn.execute.assert_called_with(
"SELECT colA FROM tablename WHERE keycol = ?", ["A set"]
)
diff --git a/tests/storage/test_directory.py b/tests/storage/test_directory.py
index 7b72a92424..20bf3ca17b 100644
--- a/tests/storage/test_directory.py
+++ b/tests/storage/test_directory.py
@@ -31,7 +31,7 @@ class DirectoryStoreTestCase(HomeserverTestCase):
)
)
- self.assertEquals(
+ self.assertEqual(
["#my-room:test"],
(self.get_success(self.store.get_aliases_for_room(self.room.to_string()))),
)
diff --git a/tests/storage/test_event_push_actions.py b/tests/storage/test_event_push_actions.py
index c9e3b9fa79..0f9add4841 100644
--- a/tests/storage/test_event_push_actions.py
+++ b/tests/storage/test_event_push_actions.py
@@ -57,7 +57,7 @@ class EventPushActionsStoreTestCase(HomeserverTestCase):
"", self.store._get_unread_counts_by_pos_txn, room_id, user_id, 0
)
)
- self.assertEquals(
+ self.assertEqual(
counts,
NotifCounts(
notify_count=noitf_count,
diff --git a/tests/storage/test_main.py b/tests/storage/test_main.py
index 4ca212fd11..5806cb0e4b 100644
--- a/tests/storage/test_main.py
+++ b/tests/storage/test_main.py
@@ -38,12 +38,12 @@ class DataStoreTestCase(unittest.HomeserverTestCase):
self.store.get_users_paginate(0, 10, name="bc", guests=False)
)
- self.assertEquals(1, total)
- self.assertEquals(self.displayname, users.pop()["displayname"])
+ self.assertEqual(1, total)
+ self.assertEqual(self.displayname, users.pop()["displayname"])
users, total = self.get_success(
self.store.get_users_paginate(0, 10, name="BC", guests=False)
)
- self.assertEquals(1, total)
- self.assertEquals(self.displayname, users.pop()["displayname"])
+ self.assertEqual(1, total)
+ self.assertEqual(self.displayname, users.pop()["displayname"])
diff --git a/tests/storage/test_profile.py b/tests/storage/test_profile.py
index b6f99af2f1..a019d06e09 100644
--- a/tests/storage/test_profile.py
+++ b/tests/storage/test_profile.py
@@ -33,7 +33,7 @@ class ProfileStoreTestCase(unittest.HomeserverTestCase):
self.store.set_profile_displayname(self.u_frank.localpart, "Frank")
)
- self.assertEquals(
+ self.assertEqual(
"Frank",
(
self.get_success(
@@ -60,7 +60,7 @@ class ProfileStoreTestCase(unittest.HomeserverTestCase):
)
)
- self.assertEquals(
+ self.assertEqual(
"http://my.site/here",
(
self.get_success(
diff --git a/tests/storage/test_registration.py b/tests/storage/test_registration.py
index 1fa495f778..a49ac1525e 100644
--- a/tests/storage/test_registration.py
+++ b/tests/storage/test_registration.py
@@ -30,7 +30,7 @@ class RegistrationStoreTestCase(HomeserverTestCase):
def test_register(self):
self.get_success(self.store.register_user(self.user_id, self.pwhash))
- self.assertEquals(
+ self.assertEqual(
{
# TODO(paul): Surely this field should be 'user_id', not 'name'
"name": self.user_id,
@@ -131,7 +131,7 @@ class RegistrationStoreTestCase(HomeserverTestCase):
),
ThreepidValidationError,
)
- self.assertEquals(e.value.msg, "Unknown session_id", e)
+ self.assertEqual(e.value.msg, "Unknown session_id", e)
# Set the config setting to true.
self.store._ignore_unknown_session_error = True
@@ -146,4 +146,4 @@ class RegistrationStoreTestCase(HomeserverTestCase):
),
ThreepidValidationError,
)
- self.assertEquals(e.value.msg, "Validation token not found or has expired", e)
+ self.assertEqual(e.value.msg, "Validation token not found or has expired", e)
diff --git a/tests/storage/test_room.py b/tests/storage/test_room.py
index 42bfca2a83..5b011e18cd 100644
--- a/tests/storage/test_room.py
+++ b/tests/storage/test_room.py
@@ -104,7 +104,7 @@ class RoomEventsStoreTestCase(HomeserverTestCase):
self.store.get_current_state(room_id=self.room.to_string())
)
- self.assertEquals(1, len(state))
+ self.assertEqual(1, len(state))
self.assertObjectHasAttributes(
{"type": "m.room.name", "room_id": self.room.to_string(), "name": name},
state[0],
@@ -121,7 +121,7 @@ class RoomEventsStoreTestCase(HomeserverTestCase):
self.store.get_current_state(room_id=self.room.to_string())
)
- self.assertEquals(1, len(state))
+ self.assertEqual(1, len(state))
self.assertObjectHasAttributes(
{"type": "m.room.topic", "room_id": self.room.to_string(), "topic": topic},
state[0],
diff --git a/tests/storage/test_room_search.py b/tests/storage/test_room_search.py
index d62e01726c..8dfc1e1db9 100644
--- a/tests/storage/test_room_search.py
+++ b/tests/storage/test_room_search.py
@@ -53,7 +53,7 @@ class EventSearchInsertionTest(HomeserverTestCase):
result = self.get_success(
store.search_msgs([room_id], "hi bob", ["content.body"])
)
- self.assertEquals(result.get("count"), 1)
+ self.assertEqual(result.get("count"), 1)
if isinstance(store.database_engine, PostgresEngine):
self.assertIn("hi", result.get("highlights"))
self.assertIn("bob", result.get("highlights"))
@@ -62,14 +62,14 @@ class EventSearchInsertionTest(HomeserverTestCase):
result = self.get_success(
store.search_msgs([room_id], "another", ["content.body"])
)
- self.assertEquals(result.get("count"), 1)
+ self.assertEqual(result.get("count"), 1)
if isinstance(store.database_engine, PostgresEngine):
self.assertIn("another", result.get("highlights"))
# Check that search works for a search term that overlaps with the message
# containing a null byte and an unrelated message.
result = self.get_success(store.search_msgs([room_id], "hi", ["content.body"]))
- self.assertEquals(result.get("count"), 2)
+ self.assertEqual(result.get("count"), 2)
result = self.get_success(
store.search_msgs([room_id], "hi alice", ["content.body"])
)
diff --git a/tests/storage/test_roommember.py b/tests/storage/test_roommember.py
index 7028f0dfb0..b8f09a8ee0 100644
--- a/tests/storage/test_roommember.py
+++ b/tests/storage/test_roommember.py
@@ -55,7 +55,7 @@ class RoomMemberStoreTestCase(unittest.HomeserverTestCase):
)
)
- self.assertEquals([self.room], [m.room_id for m in rooms_for_user])
+ self.assertEqual([self.room], [m.room_id for m in rooms_for_user])
def test_count_known_servers(self):
"""
|
