diff --git a/tests/handlers/test_register.py b/tests/handlers/test_register.py
index e9fbf32c7c..032b89d684 100644
--- a/tests/handlers/test_register.py
+++ b/tests/handlers/test_register.py
@@ -342,10 +342,10 @@ class RegistrationTestCase(unittest.HomeserverTestCase):
# Ensure the room is properly not federated.
room = self.get_success(self.store.get_room_with_stats(room_id["room_id"]))
assert room is not None
- self.assertFalse(room["federatable"])
- self.assertFalse(room["public"])
- self.assertEqual(room["join_rules"], "public")
- self.assertIsNone(room["guest_access"])
+ self.assertFalse(room.federatable)
+ self.assertFalse(room.public)
+ self.assertEqual(room.join_rules, "public")
+ self.assertIsNone(room.guest_access)
# The user should be in the room.
rooms = self.get_success(self.store.get_rooms_for_user(user_id))
@@ -372,7 +372,7 @@ class RegistrationTestCase(unittest.HomeserverTestCase):
# Ensure the room is properly a public room.
room = self.get_success(self.store.get_room_with_stats(room_id["room_id"]))
assert room is not None
- self.assertEqual(room["join_rules"], "public")
+ self.assertEqual(room.join_rules, "public")
# Both users should be in the room.
rooms = self.get_success(self.store.get_rooms_for_user(inviter))
@@ -411,9 +411,9 @@ class RegistrationTestCase(unittest.HomeserverTestCase):
# Ensure the room is properly a private room.
room = self.get_success(self.store.get_room_with_stats(room_id["room_id"]))
assert room is not None
- self.assertFalse(room["public"])
- self.assertEqual(room["join_rules"], "invite")
- self.assertEqual(room["guest_access"], "can_join")
+ self.assertFalse(room.public)
+ self.assertEqual(room.join_rules, "invite")
+ self.assertEqual(room.guest_access, "can_join")
# Both users should be in the room.
rooms = self.get_success(self.store.get_rooms_for_user(inviter))
@@ -455,9 +455,9 @@ class RegistrationTestCase(unittest.HomeserverTestCase):
# Ensure the room is properly a private room.
room = self.get_success(self.store.get_room_with_stats(room_id["room_id"]))
assert room is not None
- self.assertFalse(room["public"])
- self.assertEqual(room["join_rules"], "invite")
- self.assertEqual(room["guest_access"], "can_join")
+ self.assertFalse(room.public)
+ self.assertEqual(room.join_rules, "invite")
+ self.assertEqual(room.guest_access, "can_join")
# Both users should be in the room.
rooms = self.get_success(self.store.get_rooms_for_user(inviter))
diff --git a/tests/http/__init__.py b/tests/http/__init__.py
index d5306e7ee0..9108a3007b 100644
--- a/tests/http/__init__.py
+++ b/tests/http/__init__.py
@@ -182,7 +182,7 @@ def wrap_server_factory_for_tls(
)
else:
return TLSMemoryBIOFactory(
- connection_creator, isClient=False, wrappedFactory=factory, clock=clock # type: ignore[call-arg]
+ connection_creator, isClient=False, wrappedFactory=factory, clock=clock
)
diff --git a/tests/server.py b/tests/server.py
index cfb0fb823b..c8342db399 100644
--- a/tests/server.py
+++ b/tests/server.py
@@ -484,7 +484,7 @@ class ThreadedMemoryReactorClock(MemoryReactorClock):
if twisted.version > Version("Twisted", 23, 8, 0):
from twisted.protocols import tls
- tls._get_default_clock = lambda: self # type: ignore[attr-defined]
+ tls._get_default_clock = lambda: self
self.nameResolver = SimpleResolverComplexifier(FakeResolver())
super().__init__()
diff --git a/tests/storage/test_main.py b/tests/storage/test_main.py
index b8823d6993..01c0e5e671 100644
--- a/tests/storage/test_main.py
+++ b/tests/storage/test_main.py
@@ -39,11 +39,11 @@ class DataStoreTestCase(unittest.HomeserverTestCase):
)
self.assertEqual(1, total)
- self.assertEqual(self.displayname, users.pop()["displayname"])
+ self.assertEqual(self.displayname, users.pop().displayname)
users, total = self.get_success(
self.store.get_users_paginate(0, 10, name="BC", guests=False)
)
self.assertEqual(1, total)
- self.assertEqual(self.displayname, users.pop()["displayname"])
+ self.assertEqual(self.displayname, users.pop().displayname)
diff --git a/tests/storage/test_room.py b/tests/storage/test_room.py
index 1e27f2c275..ce34195a25 100644
--- a/tests/storage/test_room.py
+++ b/tests/storage/test_room.py
@@ -59,14 +59,9 @@ class RoomStoreTestCase(HomeserverTestCase):
def test_get_room_with_stats(self) -> None:
res = self.get_success(self.store.get_room_with_stats(self.room.to_string()))
assert res is not None
- self.assertLessEqual(
- {
- "room_id": self.room.to_string(),
- "creator": self.u_creator.to_string(),
- "public": True,
- }.items(),
- res.items(),
- )
+ self.assertEqual(res.room_id, self.room.to_string())
+ self.assertEqual(res.creator, self.u_creator.to_string())
+ self.assertTrue(res.public)
def test_get_room_with_stats_unknown_room(self) -> None:
self.assertIsNone(
|
