summary refs log tree commit diff
path: root/tests/rest/client
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2021-08-24 17:13:29 +0100
committerErik Johnston <erik@matrix.org>2021-08-24 17:13:29 +0100
commitcd22fb568a190a1b2083b651a48495439d6ced99 (patch)
treeb426843cbe20da156319a6fba7a14ed494edcf97 /tests/rest/client
parentPersist room hierarchy pagination sessions to the database. (#10613) (diff)
parentUpdate changelog (diff)
downloadsynapse-cd22fb568a190a1b2083b651a48495439d6ced99.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'tests/rest/client')
-rw-r--r--tests/rest/client/test_capabilities.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/rest/client/test_capabilities.py b/tests/rest/client/test_capabilities.py
index ac31e5ceaf..422361b62a 100644
--- a/tests/rest/client/test_capabilities.py
+++ b/tests/rest/client/test_capabilities.py
@@ -171,7 +171,8 @@ class CapabilitiesTestCase(unittest.HomeserverTestCase):
         self.assertEqual(channel.code, 200)
         self.assertFalse(capabilities["org.matrix.msc3283.3pid_changes"]["enabled"])
 
-    def test_get_does_not_include_msc3244_fields_by_default(self):
+    @override_config({"experimental_features": {"msc3244_enabled": False}})
+    def test_get_does_not_include_msc3244_fields_when_disabled(self):
         access_token = self.get_success(
             self.auth_handler.get_access_token_for_user_id(
                 self.user, device_id=None, valid_until_ms=None
@@ -186,7 +187,6 @@ class CapabilitiesTestCase(unittest.HomeserverTestCase):
             "org.matrix.msc3244.room_capabilities", capabilities["m.room_versions"]
         )
 
-    @override_config({"experimental_features": {"msc3244_enabled": True}})
     def test_get_does_include_msc3244_fields_when_enabled(self):
         access_token = self.get_success(
             self.auth_handler.get_access_token_for_user_id(