Merge branch 'develop' into babolivier/msc1802

This commit is contained in:
Brendan Abolivier 2019-11-14 10:12:11 +00:00
commit c8444b4152
2 changed files with 3 additions and 0 deletions

1
changelog.d/6361.misc Normal file
View File

@ -0,0 +1 @@
Temporarily blacklist the failing unit test PurgeRoomTestCase.test_purge_room.

View File

@ -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"