diff --git a/tests/handlers/test_typing.py b/tests/handlers/test_typing.py
index 2d76b23564..b318d4944a 100644
--- a/tests/handlers/test_typing.py
+++ b/tests/handlers/test_typing.py
@@ -131,6 +131,13 @@ class TypingNotificationsTestCase(unittest.TestCase):
return defer.succeed([])
self.room_member_handler.get_room_members = get_room_members
+ def get_joined_rooms_for_user(user):
+ if user in self.room_members:
+ return defer.succeed([self.room_id])
+ else:
+ return defer.succeed([])
+ self.room_member_handler.get_joined_rooms_for_user = get_joined_rooms_for_user
+
@defer.inlineCallbacks
def fetch_room_distributions_into(room_id, localusers=None,
remotedomains=None, ignore_user=None):
@@ -180,8 +187,9 @@ class TypingNotificationsTestCase(unittest.TestCase):
])
self.assertEquals(self.event_source.get_current_key(), 1)
+ events = yield self.event_source.get_new_events_for_user(self.u_apple, 0, None)
self.assertEquals(
- self.event_source.get_new_events_for_user(self.u_apple, 0, None)[0],
+ events[0],
[
{"type": "m.typing",
"room_id": self.room_id,
@@ -242,8 +250,9 @@ class TypingNotificationsTestCase(unittest.TestCase):
])
self.assertEquals(self.event_source.get_current_key(), 1)
+ events = yield self.event_source.get_new_events_for_user(self.u_apple, 0, None)
self.assertEquals(
- self.event_source.get_new_events_for_user(self.u_apple, 0, None)[0],
+ events[0],
[
{"type": "m.typing",
"room_id": self.room_id,
@@ -297,8 +306,9 @@ class TypingNotificationsTestCase(unittest.TestCase):
yield put_json.await_calls()
self.assertEquals(self.event_source.get_current_key(), 1)
+ events = yield self.event_source.get_new_events_for_user(self.u_apple, 0, None)
self.assertEquals(
- self.event_source.get_new_events_for_user(self.u_apple, 0, None)[0],
+ events[0],
[
{"type": "m.typing",
"room_id": self.room_id,
@@ -327,8 +337,9 @@ class TypingNotificationsTestCase(unittest.TestCase):
self.on_new_user_event.reset_mock()
self.assertEquals(self.event_source.get_current_key(), 1)
+ events = yield self.event_source.get_new_events_for_user(self.u_apple, 0, None)
self.assertEquals(
- self.event_source.get_new_events_for_user(self.u_apple, 0, None)[0],
+ events[0],
[
{"type": "m.typing",
"room_id": self.room_id,
@@ -345,8 +356,9 @@ class TypingNotificationsTestCase(unittest.TestCase):
])
self.assertEquals(self.event_source.get_current_key(), 2)
+ events = yield self.event_source.get_new_events_for_user(self.u_apple, 1, None)
self.assertEquals(
- self.event_source.get_new_events_for_user(self.u_apple, 1, None)[0],
+ events[0],
[
{"type": "m.typing",
"room_id": self.room_id,
@@ -371,8 +383,9 @@ class TypingNotificationsTestCase(unittest.TestCase):
self.on_new_user_event.reset_mock()
self.assertEquals(self.event_source.get_current_key(), 3)
+ events = yield self.event_source.get_new_events_for_user(self.u_apple, 0, None)
self.assertEquals(
- self.event_source.get_new_events_for_user(self.u_apple, 0, None)[0],
+ events[0],
[
{"type": "m.typing",
"room_id": self.room_id,
diff --git a/tests/rest/client/v1/test_typing.py b/tests/rest/client/v1/test_typing.py
index 80f2ec9ddf..7b3bd87439 100644
--- a/tests/rest/client/v1/test_typing.py
+++ b/tests/rest/client/v1/test_typing.py
@@ -34,6 +34,8 @@ class RoomTypingTestCase(RestTestCase):
""" Tests /rooms/$room_id/typing/$user_id REST API. """
user_id = "@sid:red"
+ user = UserID.from_string(user_id)
+
@defer.inlineCallbacks
def setUp(self):
self.clock = MockClock()
@@ -75,7 +77,7 @@ class RoomTypingTestCase(RestTestCase):
def get_room_members(room_id):
if room_id == self.room_id:
- return defer.succeed([UserID.from_string(self.user_id)])
+ return defer.succeed([self.user])
else:
return defer.succeed([])
@@ -115,8 +117,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, 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,
|
