summary refs log tree commit diff
path: root/tests/handlers
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-06-03 17:20:56 +0100
committerErik Johnston <erik@matrix.org>2015-06-03 17:20:56 +0100
commit3bbd0d0e09c973d1280fa1cee2722cb2b8e46c89 (patch)
tree7d779559e825db59ee73836f0a67d3a635a97519 /tests/handlers
parentMerge pull request #179 from matrix-org/erikj/state_group_outliers (diff)
parentDon't needlessly compute prev_state (diff)
downloadsynapse-3bbd0d0e09c973d1280fa1cee2722cb2b8e46c89.tar.xz
Merge pull request #180 from matrix-org/erikj/prev_state_context
Don't needlessly compute prev_state
Diffstat (limited to 'tests/handlers')
-rw-r--r--tests/handlers/test_room.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/handlers/test_room.py b/tests/handlers/test_room.py
index a2d7635995..2a7553f982 100644
--- a/tests/handlers/test_room.py
+++ b/tests/handlers/test_room.py
@@ -42,6 +42,7 @@ class RoomMemberHandlerTestCase(unittest.TestCase):
                 "get_room",
                 "store_room",
                 "get_latest_events_in_room",
+                "add_event_hashes",
             ]),
             resource_for_federation=NonCallableMock(),
             http_client=NonCallableMock(spec_set=[]),
@@ -88,6 +89,7 @@ class RoomMemberHandlerTestCase(unittest.TestCase):
         self.ratelimiter.send_message.return_value = (True, 0)
 
         self.datastore.persist_event.return_value = (1,1)
+        self.datastore.add_event_hashes.return_value = []
 
     @defer.inlineCallbacks
     def test_invite(self):