summary refs log tree commit diff
path: root/tests/rest
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-12-09 11:32:44 +0000
committerGitHub <noreply@github.com>2019-12-09 11:32:44 +0000
commita9b393340fb9e4bf227f5ef0ca3de708748a617c (patch)
treeb80d67d8eaf89bb1e993cf159643229b4672541a /tests/rest
parentMerge pull request #6469 from matrix-org/erikj/make_database_class (diff)
parentFixup functions to consistently return deferreds (diff)
downloadsynapse-a9b393340fb9e4bf227f5ef0ca3de708748a617c.tar.xz
Merge pull request #6484 from matrix-org/erikj/port_sync_handler
Port SyncHandler to async/await
Diffstat (limited to 'tests/rest')
-rw-r--r--tests/rest/client/v1/test_typing.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/rest/client/v1/test_typing.py b/tests/rest/client/v1/test_typing.py
index 30fb77bac8..4bc3aaf02d 100644
--- a/tests/rest/client/v1/test_typing.py
+++ b/tests/rest/client/v1/test_typing.py
@@ -109,7 +109,9 @@ class RoomTypingTestCase(unittest.HomeserverTestCase):
         self.assertEquals(200, channel.code)
 
         self.assertEquals(self.event_source.get_current_key(), 1)
-        events = self.event_source.get_new_events(from_key=0, room_ids=[self.room_id])
+        events = self.get_success(
+            self.event_source.get_new_events(from_key=0, room_ids=[self.room_id])
+        )
         self.assertEquals(
             events[0],
             [