diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2019-11-14 10:12:11 +0000 |
|---|---|---|
| committer | Brendan Abolivier <babolivier@matrix.org> | 2019-11-14 10:12:11 +0000 |
| commit | c8444b4152bc52d989420a8578d4ff031123d774 (patch) | |
| tree | a9581b87cad6c876abf814a002392c142d5d5ba0 | |
| parent | Lint (diff) | |
| parent | Blacklist PurgeRoomTestCase (#6361) (diff) | |
| download | synapse-c8444b4152bc52d989420a8578d4ff031123d774.tar.xz | |
Merge branch 'develop' into babolivier/msc1802
| -rw-r--r-- | changelog.d/6361.misc | 1 | ||||
| -rw-r--r-- | tests/rest/admin/test_admin.py | 2 |
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" |