Fix purge_room admin API (#6711)

* commit '19a1aac48': Fix purge_room admin API (#6711)
matrix-org · Mar 23, 2020 · 888e203 · 888e203
2 parents 02931b9 + 19a1aac
commit 888e203
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/changelog.d/6711.bugfix b/changelog.d/6711.bugfix
@@ -0,0 +1 @@
+Fix `purge_room` admin API.
diff --git a/synapse/storage/purge_events.py b/synapse/storage/purge_events.py
@@ -34,7 +34,7 @@ def purge_room(self, room_id: str):
         """
 
         state_groups_to_delete = yield self.stores.main.purge_room(room_id)
-        yield self.stores.main.purge_room_state(room_id, state_groups_to_delete)
+        yield self.stores.state.purge_room_state(room_id, state_groups_to_delete)
 
     @defer.inlineCallbacks
     def purge_history(self, room_id, token, delete_local_events):

diff --git a/tests/rest/admin/test_admin.py b/tests/rest/admin/test_admin.py
@@ -337,7 +337,7 @@ def test_purge_room(self):
             "local_invites",
             "room_account_data",
             "room_tags",
-            "state_groups",
+            # "state_groups",  # Current impl leaves orphaned state groups around.
             "state_groups_state",
         ):
             count = self.get_success(
@@ -351,8 +351,6 @@ def test_purge_room(self):
 
             self.assertEqual(count, 0, msg="Rows not purged in {}".format(table))
 
-    test_purge_room.skip = "Disabled because it's currently broken"
-
 
 class QuarantineMediaTestCase(unittest.HomeserverTestCase):
     """Test /quarantine_media admin API.