diff options
author | Daniel Wagner-Hall <dawagner@gmail.com> | 2015-11-12 17:28:48 +0000 |
---|---|---|
committer | Daniel Wagner-Hall <dawagner@gmail.com> | 2015-11-12 17:28:48 +0000 |
commit | fc27ca90066b49d3dc1ee785ba50b1f6745e230c (patch) | |
tree | fc20c7ac687e4354ea3b0c5e9de0da42ee486b33 /tests/rest/client | |
parent | Merge pull request #368 from matrix-org/erikj/fix_federation_profile (diff) | |
parent | Return non-room events from guest /events calls (diff) | |
download | synapse-fc27ca90066b49d3dc1ee785ba50b1f6745e230c.tar.xz |
Merge pull request #369 from matrix-org/daniel/guestnonevents
Return non-room events from guest /events calls
Diffstat (limited to 'tests/rest/client')
-rw-r--r-- | tests/rest/client/v1/test_presence.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/rest/client/v1/test_presence.py b/tests/rest/client/v1/test_presence.py index 7f29d73d95..8581796f72 100644 --- a/tests/rest/client/v1/test_presence.py +++ b/tests/rest/client/v1/test_presence.py @@ -321,6 +321,9 @@ class PresenceEventStreamTestCase(unittest.TestCase): hs.handlers.room_member_handler.get_room_members = ( lambda r: self.room_members if r == "a-room" else [] ) + hs.handlers.room_member_handler._filter_events_for_client = ( + lambda user_id, events, **kwargs: events + ) self.mock_datastore = hs.get_datastore() self.mock_datastore.get_app_service_by_token = Mock(return_value=None) |