diff options
author | Andrew Morgan <andrew@amorgan.xyz> | 2019-11-14 10:26:27 +0000 |
---|---|---|
committer | Andrew Morgan <andrew@amorgan.xyz> | 2019-11-14 10:26:27 +0000 |
commit | 473acedcdde26372003359a97699fba833824692 (patch) | |
tree | df6441348856b5a731b91ca09602a9e127bb8801 /tests/rest/admin/test_admin.py | |
parent | sample config (diff) | |
parent | Merge pull request #6220 from matrix-org/neilj/set_room_version_default_to_5 (diff) | |
download | synapse-473acedcdde26372003359a97699fba833824692.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into anoa/homeserver_copy
* 'develop' of github.com:matrix-org/synapse: Blacklist PurgeRoomTestCase (#6361) Set room version default to 5
Diffstat (limited to 'tests/rest/admin/test_admin.py')
-rw-r--r-- | tests/rest/admin/test_admin.py | 2 |
1 files changed, 2 insertions, 0 deletions
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" |