diff options
| author | Erik Johnston <erikj@jki.re> | 2018-02-26 14:45:40 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-26 14:45:40 +0000 |
| commit | e5b4a208ced9df795e1944cda79846690530eac7 (patch) | |
| tree | 5bd57b753d84383966b9f14346ade11faae9e168 /tests | |
| parent | Merge pull request #2894 from matrix-org/erikj/handle_unpersisted_events_push (diff) | |
| parent | Update comments (diff) | |
| download | synapse-e5b4a208ced9df795e1944cda79846690530eac7.tar.xz | |
Merge pull request #2892 from matrix-org/erikj/batch_inserts_push_actions
Batch inserts into event_push_actions_staging
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/replication/slave/storage/test_events.py | 10 | ||||
| -rw-r--r-- | tests/storage/test_event_push_actions.py | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/tests/replication/slave/storage/test_events.py b/tests/replication/slave/storage/test_events.py index 4780f2ab72..cb058d3142 100644 --- a/tests/replication/slave/storage/test_events.py +++ b/tests/replication/slave/storage/test_events.py @@ -230,10 +230,12 @@ class SlavedEventStoreTestCase(BaseSlavedStoreTestCase): state_handler = self.hs.get_state_handler() context = yield state_handler.compute_event_context(event) - for user_id, actions in push_actions: - yield self.master_store.add_push_actions_to_staging( - event.event_id, user_id, actions, - ) + yield self.master_store.add_push_actions_to_staging( + event.event_id, { + user_id: actions + for user_id, actions in push_actions + }, + ) ordering = None if backfill: diff --git a/tests/storage/test_event_push_actions.py b/tests/storage/test_event_push_actions.py index dc90e5c243..6c1aad149b 100644 --- a/tests/storage/test_event_push_actions.py +++ b/tests/storage/test_event_push_actions.py @@ -71,7 +71,7 @@ class EventPushActionsStoreTestCase(tests.unittest.TestCase): event.depth = stream yield self.store.add_push_actions_to_staging( - event.event_id, user_id, action, + event.event_id, {user_id: action}, ) yield self.store.runInteraction( "", self.store._set_push_actions_for_event_and_users_txn, |