diff options
| author | Kegan Dougal <kegan@matrix.org> | 2015-03-16 10:09:15 +0000 |
|---|---|---|
| committer | Kegan Dougal <kegan@matrix.org> | 2015-03-16 10:09:15 +0000 |
| commit | f9232c7917322de392921336b4bab5d85c213c4e (patch) | |
| tree | ab55547f1c895da508e6ac37c8056fef5b3b754e /tests/handlers/test_presence.py | |
| parent | Fix remaining scheduler bugs. Add more informative logging. (diff) | |
| parent | add ToC and fix typoe (diff) | |
| download | synapse-f9232c7917322de392921336b4bab5d85c213c4e.tar.xz | |
Merge branch 'develop' into application-services-txn-reliability
Conflicts: synapse/storage/appservice.py
Diffstat (limited to 'tests/handlers/test_presence.py')
| -rw-r--r-- | tests/handlers/test_presence.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/handlers/test_presence.py b/tests/handlers/test_presence.py index 6ffc3c99cc..04eba4289e 100644 --- a/tests/handlers/test_presence.py +++ b/tests/handlers/test_presence.py @@ -100,7 +100,7 @@ class PresenceTestCase(unittest.TestCase): self.room_members = [] room_member_handler = handlers.room_member_handler = Mock(spec=[ - "get_rooms_for_user", + "get_joined_rooms_for_user", "get_room_members", "fetch_room_distributions_into", ]) @@ -111,7 +111,7 @@ class PresenceTestCase(unittest.TestCase): return defer.succeed([self.room_id]) else: return defer.succeed([]) - room_member_handler.get_rooms_for_user = get_rooms_for_user + room_member_handler.get_joined_rooms_for_user = get_rooms_for_user def get_room_members(room_id): if room_id == self.room_id: |