From 7e22afbc7c53af8635262aa25d1663900f6bc1c4 Mon Sep 17 00:00:00 2001
From: "Paul \"LeoNerd\" Evans" <paul@matrix.org>
Date: Mon, 1 Sep 2014 22:30:09 +0100
Subject: Ensure that event source unit tests could cope with
 get_new_events_for_user() returning a Deferred

---
 tests/handlers/test_presence.py | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

(limited to 'tests')

diff --git a/tests/handlers/test_presence.py b/tests/handlers/test_presence.py
index 2eea474391..b8309bc063 100644
--- a/tests/handlers/test_presence.py
+++ b/tests/handlers/test_presence.py
@@ -632,9 +632,12 @@ class PresencePushTestCase(unittest.TestCase):
             {"presence": ONLINE}
         )
 
+        (events, _) = yield self.event_source.get_new_events_for_user(
+            self.u_apple, 0, None
+        )
+
         self.assertEquals(self.event_source.get_current_key(), 1)
-        self.assertEquals(
-            self.event_source.get_new_events_for_user(self.u_apple, 0, None)[0],
+        self.assertEquals(events,
             [
                 {"type": "m.presence",
                  "content": {
@@ -680,11 +683,12 @@ class PresencePushTestCase(unittest.TestCase):
                  "state": OFFLINE},
         ], presence)
 
+        (events, _) = yield self.event_source.get_new_events_for_user(
+            self.u_apple, 1, None
+        )
+
         self.assertEquals(self.event_source.get_current_key(), 2)
-        self.assertEquals(
-            self.event_source.get_new_events_for_user(
-                self.u_banana, 1, None
-            )[0],
+        self.assertEquals(events,
             [
                 {"type": "m.presence",
                  "content": {
@@ -760,11 +764,12 @@ class PresencePushTestCase(unittest.TestCase):
             )
         )
 
+        (events, _) = yield self.event_source.get_new_events_for_user(
+            self.u_apple, 0, None
+        )
+
         self.assertEquals(self.event_source.get_current_key(), 1)
-        self.assertEquals(
-            self.event_source.get_new_events_for_user(
-                self.u_apple, 0, None
-            )[0],
+        self.assertEquals(events,
             [
                 {"type": "m.presence",
                  "content": {
@@ -804,11 +809,12 @@ class PresencePushTestCase(unittest.TestCase):
             "a-room"
         )
 
+        (events, _) = yield self.event_source.get_new_events_for_user(
+            self.u_apple, 0, None
+        )
+
         self.assertEquals(self.event_source.get_current_key(), 1)
-        self.assertEquals(
-            self.event_source.get_new_events_for_user(
-                self.u_apple, 0, None
-            )[0],
+        self.assertEquals(events,
             [
                 {"type": "m.presence",
                  "content": {
-- 
cgit 1.4.1