From d027e859cd284a7ce56248e36c0fb2457b8010b2 Mon Sep 17 00:00:00 2001 From: "Paul \"LeoNerd\" Evans" Date: Wed, 27 Aug 2014 18:29:45 +0100 Subject: Fix up the various presence-related tests so that if they're not skipped, they still PASS --- tests/handlers/test_presence.py | 10 ++++++---- tests/handlers/test_presencelike.py | 4 ++++ 2 files changed, 10 insertions(+), 4 deletions(-) (limited to 'tests/handlers') diff --git a/tests/handlers/test_presence.py b/tests/handlers/test_presence.py index 6d3cd76dba..824ed07169 100644 --- a/tests/handlers/test_presence.py +++ b/tests/handlers/test_presence.py @@ -92,10 +92,7 @@ class PresenceStateTestCase(unittest.TestCase): self.datastore.is_presence_visible = is_presence_visible # Mock the RoomMemberHandler - room_member_handler = Mock(spec=[ - "get_rooms_for_user", - "get_room_members", - ]) + room_member_handler = Mock(spec=[]) hs.handlers.room_member_handler = room_member_handler logging.getLogger().debug("Mocking room_member_handler=%r", room_member_handler) @@ -122,6 +119,11 @@ class PresenceStateTestCase(unittest.TestCase): return defer.succeed([]) room_member_handler.get_room_members = get_room_members + def do_users_share_a_room(userlist): + shared = all(map(lambda u: u in self.room_members, userlist)) + return defer.succeed(shared) + self.datastore.do_users_share_a_room = do_users_share_a_room + self.mock_start = Mock() self.mock_stop = Mock() diff --git a/tests/handlers/test_presencelike.py b/tests/handlers/test_presencelike.py index c25c6889be..1b106fc2b3 100644 --- a/tests/handlers/test_presencelike.py +++ b/tests/handlers/test_presencelike.py @@ -102,6 +102,10 @@ class PresenceProfilelikeDataTestCase(unittest.TestCase): ]) self.datastore.get_presence_list = get_presence_list + def do_users_share_a_room(userlist): + return defer.succeed(False) + self.datastore.do_users_share_a_room = do_users_share_a_room + self.handlers = hs.get_handlers() self.mock_update_client = Mock() -- cgit 1.4.1