summary refs log tree commit diff
diff options
context:
space:
mode:
authorPatrick Cloke <clokep@users.noreply.github.com>2022-04-20 09:56:59 -0400
committerGitHub <noreply@github.com>2022-04-20 09:56:59 -0400
commitd0c1f4ca4c66d4b067ff5fd1be43285f54773d4f (patch)
tree1182cd2149ff79741e563d8ac1bd62811940704b
parentImplement MSC2815: allow room moderators to view redacted event content (#12427) (diff)
downloadsynapse-d0c1f4ca4c66d4b067ff5fd1be43285f54773d4f.tar.xz
Remove unnecessary config overrides for MSC3666. (#12511)
-rw-r--r--changelog.d/12511.misc1
-rw-r--r--tests/rest/client/test_relations.py4
2 files changed, 1 insertions, 4 deletions
diff --git a/changelog.d/12511.misc b/changelog.d/12511.misc
new file mode 100644
index 0000000000..a314bedfc4
--- /dev/null
+++ b/changelog.d/12511.misc
@@ -0,0 +1 @@
+Remove unnecessary configuration overrides in tests.
diff --git a/tests/rest/client/test_relations.py b/tests/rest/client/test_relations.py
index 57d97bbb47..65743cdf67 100644
--- a/tests/rest/client/test_relations.py
+++ b/tests/rest/client/test_relations.py
@@ -355,7 +355,6 @@ class RelationsTestCase(BaseRelationsTestCase):
         self.assertEqual(200, channel.code, channel.json_body)
         self.assertNotIn("m.relations", channel.json_body["unsigned"])
 
-    @unittest.override_config({"experimental_features": {"msc3666_enabled": True}})
     def test_edit(self) -> None:
         """Test that a simple edit works."""
 
@@ -998,7 +997,6 @@ class BundledAggregationsTestCase(BaseRelationsTestCase):
         ]
         assert_bundle(self._find_event_in_chunk(chunk))
 
-    @unittest.override_config({"experimental_features": {"msc3666_enabled": True}})
     def test_annotation(self) -> None:
         """
         Test that annotations get correctly bundled.
@@ -1023,7 +1021,6 @@ class BundledAggregationsTestCase(BaseRelationsTestCase):
 
         self._test_bundled_aggregations(RelationTypes.ANNOTATION, assert_annotations, 7)
 
-    @unittest.override_config({"experimental_features": {"msc3666_enabled": True}})
     def test_reference(self) -> None:
         """
         Test that references get correctly bundled.
@@ -1042,7 +1039,6 @@ class BundledAggregationsTestCase(BaseRelationsTestCase):
 
         self._test_bundled_aggregations(RelationTypes.REFERENCE, assert_annotations, 7)
 
-    @unittest.override_config({"experimental_features": {"msc3666_enabled": True}})
     def test_thread(self) -> None:
         """
         Test that threads get correctly bundled.