diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2019-11-26 10:53:48 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-26 10:53:48 +0000 |
| commit | 4c1b799e1b9f8e04f6cd86a0977e28685ac20aea (patch) | |
| tree | fcaea2671bf38721520191c13bb37adf18ef84c5 /tests/storage | |
| parent | Format changelog (diff) | |
| parent | Make sure that we close cursors before returning from a query (#6408) (diff) | |
| download | synapse-4c1b799e1b9f8e04f6cd86a0977e28685ac20aea.tar.xz | |
Merge branch 'develop' into babolivier/context_filters
Diffstat (limited to 'tests/storage')
| -rw-r--r-- | tests/storage/test_purge.py | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/tests/storage/test_purge.py b/tests/storage/test_purge.py index f671599cb8..b9fafaa1a6 100644 --- a/tests/storage/test_purge.py +++ b/tests/storage/test_purge.py @@ -40,23 +40,24 @@ class PurgeTests(HomeserverTestCase): third = self.helper.send(self.room_id, body="test3") last = self.helper.send(self.room_id, body="test4") - storage = self.hs.get_datastore() + store = self.hs.get_datastore() + storage = self.hs.get_storage() # Get the topological token - event = storage.get_topological_token_for_event(last["event_id"]) + event = store.get_topological_token_for_event(last["event_id"]) self.pump() event = self.successResultOf(event) # Purge everything before this topological token - purge = storage.purge_history(self.room_id, event, True) + purge = storage.purge_events.purge_history(self.room_id, event, True) self.pump() self.assertEqual(self.successResultOf(purge), None) # Try and get the events - get_first = storage.get_event(first["event_id"]) - get_second = storage.get_event(second["event_id"]) - get_third = storage.get_event(third["event_id"]) - get_last = storage.get_event(last["event_id"]) + get_first = store.get_event(first["event_id"]) + get_second = store.get_event(second["event_id"]) + get_third = store.get_event(third["event_id"]) + get_last = store.get_event(last["event_id"]) self.pump() # 1-3 should fail and last will succeed, meaning that 1-3 are deleted |