summary refs log tree commit diff
path: root/tests/handlers
diff options
context:
space:
mode:
authorPaul "LeoNerd" Evans <paul@matrix.org>2014-09-02 16:16:51 +0100
committerPaul "LeoNerd" Evans <paul@matrix.org>2014-09-03 10:40:48 +0100
commitda3e04df8bcbb42f383abf406f4d71cf54b77ae2 (patch)
tree98ca8467f9c8a79740e27a581f5ebc01abfab891 /tests/handlers
parentAllow optional non-suppression of exceptions through the Distributor (diff)
downloadsynapse-da3e04df8bcbb42f383abf406f4d71cf54b77ae2.tar.xz
Rename the 'do_users_share_a_room' to something slightly less verb-sounding
Diffstat (limited to 'tests/handlers')
-rw-r--r--tests/handlers/test_presence.py4
-rw-r--r--tests/handlers/test_presencelike.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/handlers/test_presence.py b/tests/handlers/test_presence.py
index b8309bc063..618fb7f270 100644
--- a/tests/handlers/test_presence.py
+++ b/tests/handlers/test_presence.py
@@ -117,10 +117,10 @@ class PresenceStateTestCase(unittest.TestCase):
                 return defer.succeed([])
         room_member_handler.get_room_members = get_room_members
 
-        def do_users_share_a_room(userlist):
+        def user_rooms_intersect(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.datastore.user_rooms_intersect = user_rooms_intersect
 
         self.mock_start = Mock()
         self.mock_stop = Mock()
diff --git a/tests/handlers/test_presencelike.py b/tests/handlers/test_presencelike.py
index 38cc34350b..638e506d34 100644
--- a/tests/handlers/test_presencelike.py
+++ b/tests/handlers/test_presencelike.py
@@ -107,9 +107,9 @@ class PresenceProfilelikeDataTestCase(unittest.TestCase):
             return defer.succeed(self.presence_list)
         self.datastore.get_presence_list = get_presence_list
 
-        def do_users_share_a_room(userlist):
+        def user_rooms_intersect(userlist):
             return defer.succeed(False)
-        self.datastore.do_users_share_a_room = do_users_share_a_room
+        self.datastore.user_rooms_intersect = user_rooms_intersect
 
         self.handlers = hs.get_handlers()