Replace usage of deprecated assertEquals with assertEqual (#19345)

Author: anoadragon453

changelog.d/19345.misc

@@ -0,0 +1 @@
+Replace usage of deprecated `assertEquals` with `assertEqual` in unit test code.

tests/handlers/test_oauth_delegation.py

@@ -889,11 +889,11 @@ def test_simple_introspection(self) -> None:
             )
         )
 
-        self.assertEquals(requester.user.to_string(), USER_ID)
-        self.assertEquals(requester.device_id, DEVICE)
+        self.assertEqual(requester.user.to_string(), USER_ID)
+        self.assertEqual(requester.device_id, DEVICE)
         self.assertFalse(self.get_success(self._auth.is_server_admin(requester)))
 
-        self.assertEquals(
+        self.assertEqual(
             self.server.last_token_seen,
             "some_token",
         )
@@ -912,11 +912,11 @@ def test_unexpiring_token(self) -> None:
             )
         )
 
-        self.assertEquals(requester.user.to_string(), USER_ID)
-        self.assertEquals(requester.device_id, DEVICE)
+        self.assertEqual(requester.user.to_string(), USER_ID)
+        self.assertEqual(requester.device_id, DEVICE)
         self.assertFalse(self.get_success(self._auth.is_server_admin(requester)))
 
-        self.assertEquals(
+        self.assertEqual(
             self.server.last_token_seen,
             "some_token",
         )

tests/rest/admin/test_room.py

@@ -3362,7 +3362,7 @@ def test_v12_room(self) -> None:
         pl = self.helper.get_state(
             room_id, EventTypes.PowerLevels, tok=self.creator_tok
         )
-        self.assertEquals(pl["users"][self.admin_user], 100)
+        self.assertEqual(pl["users"][self.admin_user], 100)
 
     def test_v12_room_with_many_user_pls(self) -> None:
         """Test that you can be promoted to the admin user's PL in v12 rooms that contain a range of user PLs."""
@@ -3395,7 +3395,7 @@ def test_v12_room_with_many_user_pls(self) -> None:
         pl = self.helper.get_state(
             room_id, EventTypes.PowerLevels, tok=self.creator_tok
         )
-        self.assertEquals(pl["users"][self.admin_user], 100)
+        self.assertEqual(pl["users"][self.admin_user], 100)
 
 
 class BlockRoomTestCase(unittest.HomeserverTestCase):

tests/state/test_v21.py

@@ -447,7 +447,7 @@ def resolve_and_check() -> None:
                 )
             )
             # no matter how many events are persisted, the overall diff should always be the same.
-            self.assertEquals(got_auth_diff, got_auth_diff2)
+            self.assertEqual(got_auth_diff, got_auth_diff2)
 
         # now we will drip feed in `events` one-by-one, persisting them then resolving with the
         # rest. This ensures we correctly handle mixed persisted/unpersisted events. We will finish

tests/storage/test_event_federation.py

@@ -909,7 +909,7 @@ def run_test(txn: LoggingTransaction, test_case: TestCase) -> None:
                 test_case.conflicted,
                 test_case.additional_backwards_reachable,
             )
-            self.assertEquals(
+            self.assertEqual(
                 result.conflicted_subgraph,
                 test_case.want_conflicted_subgraph,
                 f"{test_case.name} : conflicted subgraph mismatch",

tests/types/test_init.py

@@ -8,13 +8,13 @@ class RoomIDTestCase(TestCase):
     def test_can_create_msc4291_room_ids(self) -> None:
         valid_msc4291_room_id = "!31hneApxJ_1o-63DmFrpeqnkFfWppnzWso1JvH3ogLM"
         room_id = RoomID.from_string(valid_msc4291_room_id)
-        self.assertEquals(RoomID.is_valid(valid_msc4291_room_id), True)
-        self.assertEquals(
+        self.assertEqual(RoomID.is_valid(valid_msc4291_room_id), True)
+        self.assertEqual(
             room_id.to_string(),
             valid_msc4291_room_id,
         )
-        self.assertEquals(room_id.id, "!31hneApxJ_1o-63DmFrpeqnkFfWppnzWso1JvH3ogLM")
-        self.assertEquals(room_id.get_domain(), None)
+        self.assertEqual(room_id.id, "!31hneApxJ_1o-63DmFrpeqnkFfWppnzWso1JvH3ogLM")
+        self.assertEqual(room_id.get_domain(), None)
 
     def test_cannot_create_invalid_msc4291_room_ids(self) -> None:
         invalid_room_ids = [
@@ -47,5 +47,5 @@ def test_can_create_valid_legacy_room_ids(self) -> None:
         ]
         for room_id_str in valid_room_ids:
             room_id = RoomID.from_string(room_id_str)
-            self.assertEquals(RoomID.is_valid(room_id_str), True)
+            self.assertEqual(RoomID.is_valid(room_id_str), True)
             self.assertIsNotNone(room_id.get_domain())