summary refs log tree commit diff
path: root/tests/rest/client/v1
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2015-05-22 16:04:40 +0100
committerMark Haines <mjark@negativecurvature.net>2015-05-22 16:04:40 +0100
commit49a2c102791bf79d1dfc25eccd2c17689a2e95a4 (patch)
treeed4582c49fca4a192b6451e155776e336b87c32e /tests/rest/client/v1
parentMerge pull request #160 from matrix-org/markjh/appservice_performance (diff)
parentRemove spurious TODO comment (diff)
downloadsynapse-49a2c102791bf79d1dfc25eccd2c17689a2e95a4.tar.xz
Merge pull request #157 from matrix-org/markjh/presence_performance
Improve presence performance in loadtest
Diffstat (limited to 'tests/rest/client/v1')
-rw-r--r--tests/rest/client/v1/test_presence.py3
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 21f42b3d3e..523b30cf8a 100644
--- a/tests/rest/client/v1/test_presence.py
+++ b/tests/rest/client/v1/test_presence.py
@@ -297,6 +297,9 @@ class PresenceEventStreamTestCase(unittest.TestCase):
             else:
                 return []
         hs.handlers.room_member_handler.get_joined_rooms_for_user = get_rooms_for_user
+        hs.handlers.room_member_handler.get_room_members = (
+            lambda r: self.room_members if r == "a-room" else []
+        )
 
         self.mock_datastore = hs.get_datastore()
         self.mock_datastore.get_app_service_by_token = Mock(return_value=None)