diff --git a/tests/utils.py b/tests/utils.py
index 840b657f82..ebb76b3b16 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -157,6 +157,10 @@ def default_config(name, parse=False):
"local": {"per_second": 10000, "burst_count": 10000},
"remote": {"per_second": 10000, "burst_count": 10000},
},
+ "rc_invites": {
+ "per_room": {"per_second": 10000, "burst_count": 10000},
+ "per_user": {"per_second": 10000, "burst_count": 10000},
+ },
"rc_3pid_validation": {"per_second": 10000, "burst_count": 10000},
"saml2_enabled": False,
"public_baseurl": None,
@@ -173,6 +177,8 @@ def default_config(name, parse=False):
"update_user_directory": False,
"caches": {"global_factor": 1},
"listeners": [{"port": 0, "type": "http"}],
+ # Enable encryption by default in private rooms
+ "encryption_enabled_by_default_for_room_type": "invite",
}
if parse:
@@ -263,7 +269,10 @@ def setup_test_homeserver(
db_conn.close()
hs = homeserver_to_use(
- name, config=config, version_string="Synapse/tests", reactor=reactor,
+ name,
+ config=config,
+ version_string="Synapse/tests",
+ reactor=reactor,
)
# Install @cache_in_self attributes
@@ -365,7 +374,7 @@ class MockHttpResource:
def trigger(
self, http_method, path, content, mock_request, federation_auth_origin=None
):
- """ Fire an HTTP event.
+ """Fire an HTTP event.
Args:
http_method : The HTTP method
@@ -528,8 +537,7 @@ class MockClock:
async def create_room(hs, room_id: str, creator_id: str):
- """Creates and persist a creation event for the given room
- """
+ """Creates and persist a creation event for the given room"""
persistence_store = hs.get_storage().persistence
store = hs.get_datastore()
|
