summary refs log tree commit diff
path: root/tests
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2020-07-15 16:54:30 +0100
committerErik Johnston <erik@matrix.org>2020-07-15 16:54:30 +0100
commit97e1159ac19c269b5f6aa9cd62a267e7a1525c7c (patch)
tree8597d522e195f8b5a962fccfe3ae6497ba54b224 /tests
parentAllow accounts to be re-activated from the admin APIs. (#7847) (diff)
parentFix tests (diff)
downloadsynapse-97e1159ac19c269b5f6aa9cd62a267e7a1525c7c.tar.xz
Merge branch 'erikj/faster_typing' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'tests')
-rw-r--r--tests/handlers/test_typing.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/handlers/test_typing.py b/tests/handlers/test_typing.py
index 1e6a53bf7f..5878f74175 100644
--- a/tests/handlers/test_typing.py
+++ b/tests/handlers/test_typing.py
@@ -138,10 +138,10 @@ class TypingNotificationsTestCase(unittest.HomeserverTestCase):
 
         self.datastore.get_joined_hosts_for_room = get_joined_hosts_for_room
 
-        def get_current_users_in_room(room_id):
+        def get_users_in_room(room_id):
             return defer.succeed({str(u) for u in self.room_members})
 
-        hs.get_state_handler().get_current_users_in_room = get_current_users_in_room
+        self.datastore.get_users_in_room = get_users_in_room
 
         self.datastore.get_user_directory_stream_pos.return_value = (
             # we deliberately return a non-None stream pos to avoid doing an initial_spam