summary refs log tree commit diff
path: root/tests
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-12-11 15:16:55 +0000
committerErik Johnston <erik@matrix.org>2014-12-11 15:16:55 +0000
commit9191292b0f657f6210e88f16ffd9a182bfab8170 (patch)
treeabcf0f4f26d91a2650a4f6f28a0c48cfa2a559ef /tests
parentFix redaction tests (diff)
downloadsynapse-9191292b0f657f6210e88f16ffd9a182bfab8170.tar.xz
Fix prev_content
Diffstat (limited to 'tests')
-rw-r--r--tests/storage/test_stream.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/storage/test_stream.py b/tests/storage/test_stream.py
index cba65bb9f0..4865a5c142 100644
--- a/tests/storage/test_stream.py
+++ b/tests/storage/test_stream.py
@@ -58,7 +58,7 @@ class StreamStoreTestCase(unittest.TestCase):
         self.depth = 1
 
     @defer.inlineCallbacks
-    def inject_room_member(self, room, user, membership, replaces_state=None):
+    def inject_room_member(self, room, user, membership):
         self.depth += 1
 
         builder = self.event_builder_factory.new({
@@ -215,7 +215,6 @@ class StreamStoreTestCase(unittest.TestCase):
 
         event2 = yield self.inject_room_member(
             self.room1, self.u_alice, Membership.JOIN,
-            replaces_state=event1.event_id,
         )
 
         end = yield self.store.get_room_events_max_id()
@@ -233,6 +232,6 @@ class StreamStoreTestCase(unittest.TestCase):
         event = results[0]
 
         self.assertTrue(
-            hasattr(event, "prev_content"),
+            "prev_content" in event.unsigned,
             msg="No prev_content key"
         )