diff options
| author | Erik Johnston <erikj@jki.re> | 2016-09-01 14:20:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-01 14:20:42 +0100 |
| commit | 44982606ee7486f970cbfab545e77c10892fd672 (patch) | |
| tree | 91c6ff57c8b781b772044e303450322e101a34c8 /tests/replication | |
| parent | Lower get_linearized_receipts_for_room cache size (diff) | |
| parent | Use state_groups table to test existence (diff) | |
| download | synapse-44982606ee7486f970cbfab545e77c10892fd672.tar.xz | |
Merge pull request #1060 from matrix-org/erikj/state_ids
Assign state groups in state handler.
Diffstat (limited to 'tests/replication')
| -rw-r--r-- | tests/replication/slave/storage/test_events.py | 4 | ||||
| -rw-r--r-- | tests/replication/test_resource.py | 10 |
2 files changed, 5 insertions, 9 deletions
diff --git a/tests/replication/slave/storage/test_events.py b/tests/replication/slave/storage/test_events.py index 218cb24889..44e859b5d1 100644 --- a/tests/replication/slave/storage/test_events.py +++ b/tests/replication/slave/storage/test_events.py @@ -312,7 +312,9 @@ class SlavedEventStoreTestCase(BaseSlavedStoreTestCase): else: state_ids = None - context = EventContext(current_state_ids=state_ids) + 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): |