Merge branch 'develop' into babolivier/msc1802

2 files changed, 3 insertions, 0 deletions

diff --git a/changelog.d/6361.misc b/changelog.d/6361.misc
new file mode 100644

index 0000000000..324d74ebf9
--- /dev/null
+++ b/changelog.d/6361.misc
@@ -0,0 +1 @@
+Temporarily blacklist the failing unit test PurgeRoomTestCase.test_purge_room.
diff --git a/tests/rest/admin/test_admin.py b/tests/rest/admin/test_admin.py

index d9f1b95cb0..9575058252 100644
--- a/tests/rest/admin/test_admin.py
+++ b/tests/rest/admin/test_admin.py
@@ -641,3 +641,5 @@ class PurgeRoomTestCase(unittest.HomeserverTestCase):
             )
 
             self.assertEqual(count, 0, msg="Rows not purged in {}".format(table))
+
+    test_purge_room.skip = "Disabled because it's currently broken"