From 3791b75000f9787806dbdce3e6e216da1ac07388 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Wed, 5 Nov 2014 13:48:36 +0000
Subject: Fix a couple more storage tests

---
 tests/storage/test_stream.py | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

(limited to 'tests/storage/test_stream.py')

diff --git a/tests/storage/test_stream.py b/tests/storage/test_stream.py
index ab30e6ea25..b034fd8f16 100644
--- a/tests/storage/test_stream.py
+++ b/tests/storage/test_stream.py
@@ -59,8 +59,12 @@ class StreamStoreTestCase(unittest.TestCase):
             membership=membership,
             content={"membership": membership},
             depth=self.depth,
+            prev_events=[],
         )
 
+        event.state_events = None
+        event.hashes = {}
+
         if prev_state:
             event.prev_state = prev_state
 
@@ -75,15 +79,21 @@ class StreamStoreTestCase(unittest.TestCase):
     def inject_message(self, room, user, body):
         self.depth += 1
 
+        event = self.event_factory.create_event(
+            etype=MessageEvent.TYPE,
+            user_id=user.to_string(),
+            room_id=room.to_string(),
+            content={"body": body, "msgtype": u"message"},
+            depth=self.depth,
+            prev_events=[],
+        )
+
+        event.state_events = None
+        event.hashes = {}
+
         # Have to create a join event using the eventfactory
         yield self.store.persist_event(
-            self.event_factory.create_event(
-                etype=MessageEvent.TYPE,
-                user_id=user.to_string(),
-                room_id=room.to_string(),
-                content={"body": body, "msgtype": u"message"},
-                depth=self.depth,
-            )
+            event
         )
 
     @defer.inlineCallbacks
-- 
cgit 1.4.1


From 3cd9c02f71f967918f494e61121a8ecb18e67611 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Mon, 10 Nov 2014 15:29:19 +0000
Subject: Fix stream test.

---
 tests/storage/test_stream.py | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'tests/storage/test_stream.py')

diff --git a/tests/storage/test_stream.py b/tests/storage/test_stream.py
index b034fd8f16..5038546aee 100644
--- a/tests/storage/test_stream.py
+++ b/tests/storage/test_stream.py
@@ -48,7 +48,7 @@ class StreamStoreTestCase(unittest.TestCase):
         self.depth = 1
 
     @defer.inlineCallbacks
-    def inject_room_member(self, room, user, membership, prev_state=None):
+    def inject_room_member(self, room, user, membership, replaces_state=None):
         self.depth += 1
 
         event = self.event_factory.create_event(
@@ -64,9 +64,12 @@ class StreamStoreTestCase(unittest.TestCase):
 
         event.state_events = None
         event.hashes = {}
+        event.prev_state = []
+        event.auth_events = []
 
-        if prev_state:
-            event.prev_state = prev_state
+        if replaces_state:
+            event.prev_state = [(replaces_state, "hash")]
+            event.replaces_state = replaces_state
 
         # Have to create a join event using the eventfactory
         yield self.store.persist_event(
@@ -90,6 +93,7 @@ class StreamStoreTestCase(unittest.TestCase):
 
         event.state_events = None
         event.hashes = {}
+        event.auth_events = []
 
         # Have to create a join event using the eventfactory
         yield self.store.persist_event(
@@ -216,7 +220,7 @@ class StreamStoreTestCase(unittest.TestCase):
 
         event2 = yield self.inject_room_member(
             self.room1, self.u_alice, Membership.JOIN,
-            prev_state=event1.event_id,
+            replaces_state=event1.event_id,
         )
 
         end = yield self.store.get_room_events_max_id()
@@ -233,4 +237,7 @@ class StreamStoreTestCase(unittest.TestCase):
 
         event = results[0]
 
-        self.assertTrue(hasattr(event, "prev_content"), msg="No prev_content key")
+        self.assertTrue(
+            hasattr(event, "prev_content"),
+            msg="No prev_content key"
+        )
-- 
cgit 1.4.1