diff --git a/tests/handlers/test_typing.py b/tests/handlers/test_typing.py
index ab9899b7d5..b2957eef9f 100644
--- a/tests/handlers/test_typing.py
+++ b/tests/handlers/test_typing.py
@@ -62,6 +62,7 @@ class TypingNotificationsTestCase(unittest.TestCase):
self.on_new_event = mock_notifier.on_new_event
self.auth = Mock(spec=[])
+ self.state_handler = Mock()
hs = yield setup_test_homeserver(
"test",
@@ -75,6 +76,7 @@ class TypingNotificationsTestCase(unittest.TestCase):
"set_received_txn_response",
"get_destination_retry_timings",
]),
+ state_handler=self.state_handler,
handlers=None,
notifier=mock_notifier,
resource_for_client=Mock(),
@@ -113,6 +115,10 @@ class TypingNotificationsTestCase(unittest.TestCase):
return set(member.domain for member in self.room_members)
self.datastore.get_joined_hosts_for_room = get_joined_hosts_for_room
+ def get_current_user_in_room(room_id):
+ return set(str(u) for u in self.room_members)
+ self.state_handler.get_current_user_in_room = get_current_user_in_room
+
self.auth.check_joined_room = check_joined_room
# Some local users to test with
diff --git a/tests/storage/test_roommember.py b/tests/storage/test_roommember.py
index 27b2b3d123..1be7d932f6 100644
--- a/tests/storage/test_roommember.py
+++ b/tests/storage/test_roommember.py
@@ -78,44 +78,3 @@ class RoomMemberStoreTestCase(unittest.TestCase):
)
)]
)
-
- @defer.inlineCallbacks
- def test_room_hosts(self):
- yield self.inject_room_member(self.room, self.u_alice, Membership.JOIN)
-
- self.assertEquals(
- {"test"},
- (yield self.store.get_joined_hosts_for_room(self.room.to_string()))
- )
-
- # Should still have just one host after second join from it
- yield self.inject_room_member(self.room, self.u_bob, Membership.JOIN)
-
- self.assertEquals(
- {"test"},
- (yield self.store.get_joined_hosts_for_room(self.room.to_string()))
- )
-
- # Should now have two hosts after join from other host
- yield self.inject_room_member(self.room, self.u_charlie, Membership.JOIN)
-
- self.assertEquals(
- {"test", "elsewhere"},
- (yield self.store.get_joined_hosts_for_room(self.room.to_string()))
- )
-
- # Should still have both hosts
- yield self.inject_room_member(self.room, self.u_alice, Membership.LEAVE)
-
- self.assertEquals(
- {"test", "elsewhere"},
- (yield self.store.get_joined_hosts_for_room(self.room.to_string()))
- )
-
- # Should have only one host after other leaves
- yield self.inject_room_member(self.room, self.u_charlie, Membership.LEAVE)
-
- self.assertEquals(
- {"test"},
- (yield self.store.get_joined_hosts_for_room(self.room.to_string()))
- )
|
