diff options
| author | Erik Johnston <erik@matrix.org> | 2018-02-20 11:41:40 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-02-20 11:41:40 +0000 |
| commit | e440e2845642a27f15d073aea58ce20b2785f66e (patch) | |
| tree | d2c39acc089e3d493bef970140e51362847dc94a | |
| parent | Batch inserts into event_push_actions_staging (diff) | |
| download | synapse-e440e2845642a27f15d073aea58ce20b2785f66e.tar.xz | |
Fix unit 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 d483e7cf9e..550f9ba662 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, |