summary refs log tree commit diff
path: root/tests/rest/client/v1
diff options
context:
space:
mode:
authorPaul "LeoNerd" Evans <paul@matrix.org>2015-04-15 23:09:35 +0100
committerPaul "LeoNerd" Evans <paul@matrix.org>2015-04-15 23:09:35 +0100
commit0268d40281313c9a89e7b4356ae2e5f77a622857 (patch)
tree9a5498e9dc0b3a8257a474c7fffe04bc62563378 /tests/rest/client/v1
parentNeater implementation of membership change auth checks, ensuring we can't for... (diff)
downloadsynapse-0268d40281313c9a89e7b4356ae2e5f77a622857.tar.xz
Have TypingNotificationEventSource.get_new_events_for_user() return a deferred, for consistency and extensibility
Diffstat (limited to 'tests/rest/client/v1')
-rw-r--r--tests/rest/client/v1/test_typing.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/rest/client/v1/test_typing.py b/tests/rest/client/v1/test_typing.py
index 80f2ec9ddf..d04e5abda4 100644
--- a/tests/rest/client/v1/test_typing.py
+++ b/tests/rest/client/v1/test_typing.py
@@ -115,8 +115,9 @@ class RoomTypingTestCase(RestTestCase):
         self.assertEquals(200, code)
 
         self.assertEquals(self.event_source.get_current_key(), 1)
+        events = yield self.event_source.get_new_events_for_user(self.user_id, 0, None)
         self.assertEquals(
-            self.event_source.get_new_events_for_user(self.user_id, 0, None)[0],
+            events[0],
             [
                 {"type": "m.typing",
                  "room_id": self.room_id,