Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Remove unnecessary config overrides for MSC3666. #12511

Merged
merged 2 commits into from
Apr 20, 2022
Merged

Remove unnecessary config overrides for MSC3666. #12511

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9048855
Remove unnecessary config overrides for MSC3666.
clokep Apr 20, 2022
486173c
Newsfragment
clokep Apr 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/12511.misc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Remove unnecessary configuration overrides in tests.
4 changes: 0 additions & 4 deletions tests/rest/client/test_relations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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."""

Expand Down Expand Up @@ -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.
Expand All @@ -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.
Expand All @@ -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.
Expand Down