summary refs log tree commit diff
path: root/tests/replication/test_resource.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-05-18 11:38:24 +0100
committerErik Johnston <erik@matrix.org>2016-05-18 11:38:24 +0100
commit5941346c5b8b0847a0adc643e80ba6ba8669c149 (patch)
tree0f7bd386246268177ca45ee4b6ddd992b333e085 /tests/replication/test_resource.py
parentCorrectly order recents (diff)
parentAdd desc to get_presence_for_users (diff)
downloadsynapse-5941346c5b8b0847a0adc643e80ba6ba8669c149.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/paginate_sync
Diffstat (limited to 'tests/replication/test_resource.py')
-rw-r--r--tests/replication/test_resource.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/replication/test_resource.py b/tests/replication/test_resource.py

index b1dd7b4a74..842e3d29d7 100644 --- a/tests/replication/test_resource.py +++ b/tests/replication/test_resource.py
@@ -78,7 +78,7 @@ class ReplicationResourceCase(unittest.TestCase): @defer.inlineCallbacks def test_presence(self): get = self.get(presence="-1") - yield self.hs.get_handlers().presence_handler.set_state( + yield self.hs.get_presence_handler().set_state( self.user, {"presence": "online"} ) code, body = yield get @@ -93,7 +93,7 @@ class ReplicationResourceCase(unittest.TestCase): def test_typing(self): room_id = yield self.create_room() get = self.get(typing="-1") - yield self.hs.get_handlers().typing_notification_handler.started_typing( + yield self.hs.get_typing_handler().started_typing( self.user, self.user, room_id, timeout=2 ) code, body = yield get