summary refs log tree commit diff
path: root/tests/rest
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-03-19 17:13:08 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2020-03-19 17:13:08 +0000
commit2beae00b3b4556ff07a5fe8cc08d4a4d25087ccf (patch)
treed8d223de4ed229de355dfe1fb73f0419786dc4da /tests/rest
parentMerge pull request #6469 from matrix-org/erikj/make_database_class (diff)
parentMerge pull request #6484 from matrix-org/erikj/port_sync_handler (diff)
downloadsynapse-2beae00b3b4556ff07a5fe8cc08d4a4d25087ccf.tar.xz
Merge pull request #6484 from matrix-org/erikj/port_sync_handler
* commit 'a9b393340':
  Fixup functions to consistently return deferreds
  Newsfile
  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], [