diff --git a/tests/replication/slave/storage/test_events.py b/tests/replication/slave/storage/test_events.py
index f33e6f60fb..44e859b5d1 100644
--- a/tests/replication/slave/storage/test_events.py
+++ b/tests/replication/slave/storage/test_events.py
@@ -305,7 +305,16 @@ class SlavedEventStoreTestCase(BaseSlavedStoreTestCase):
self.event_id += 1
- context = EventContext(current_state=state)
+ if state is not None:
+ state_ids = {
+ key: e.event_id for key, e in state.items()
+ }
+ else:
+ state_ids = None
+
+ context = EventContext()
+ context.current_state_ids = state_ids
+ context.prev_state_ids = state_ids
context.push_actions = push_actions
ordering = None
diff --git a/tests/replication/test_resource.py b/tests/replication/test_resource.py
index e70ac6f14d..b69832cc1b 100644
--- a/tests/replication/test_resource.py
+++ b/tests/replication/test_resource.py
@@ -60,8 +60,8 @@ class ReplicationResourceCase(unittest.TestCase):
self.assertEquals(body, {})
@defer.inlineCallbacks
- def test_events_and_state(self):
- get = self.get(events="-1", state="-1", timeout="0")
+ def test_events(self):
+ get = self.get(events="-1", timeout="0")
yield self.hs.get_handlers().room_creation_handler.create_room(
synapse.types.create_requester(self.user), {}
)
@@ -70,12 +70,6 @@ class ReplicationResourceCase(unittest.TestCase):
self.assertEquals(body["events"]["field_names"], [
"position", "internal", "json", "state_group"
])
- self.assertEquals(body["state_groups"]["field_names"], [
- "position", "room_id", "event_id"
- ])
- self.assertEquals(body["state_group_state"]["field_names"], [
- "position", "type", "state_key", "event_id"
- ])
@defer.inlineCallbacks
def test_presence(self):
|
