Remove unnecessary config overrides for MSC3666. (#12511)

matrix-org · Apr 20, 2022 · d0c1f4c · d0c1f4c
1 parent 4bc8cb4
commit d0c1f4c
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/changelog.d/12511.misc 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
@@ -355,7 +355,6 @@ def test_ignore_invalid_room(self) -> None:
         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 @@ def assert_bundle(event_json: JsonDict) -> None:
         ]
         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 @@ def assert_annotations(bundled_aggregations: JsonDict) -> None:
 
         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 @@ def assert_annotations(bundled_aggregations: JsonDict) -> None:
 
         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.