summary refs log tree commit diff
path: root/tests/utils.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2020-07-31 18:21:48 +0100
committerGitHub <noreply@github.com>2020-07-31 18:21:48 +0100
commit394be6a0e69195cefc4b234dc41e670799dd46d4 (patch)
tree9fca4c5ed30c77c43023d9b365a37ec90261f2b4 /tests/utils.py
parentAdd docs for undoing room shutdowns (#7998) (diff)
parentMerge branch 'develop' of github.com:matrix-org/synapse into erikj/add_rate_l... (diff)
downloadsynapse-394be6a0e69195cefc4b234dc41e670799dd46d4.tar.xz
Merge pull request #8008 from matrix-org/erikj/add_rate_limiting_to_joins
Add ratelimiting on joins
Diffstat (limited to 'tests/utils.py')
-rw-r--r--tests/utils.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/utils.py b/tests/utils.py

index b33b6860d4..a61cbdef44 100644 --- a/tests/utils.py +++ b/tests/utils.py
@@ -154,6 +154,10 @@ def default_config(name, parse=False): "account": {"per_second": 10000, "burst_count": 10000}, "failed_attempts": {"per_second": 10000, "burst_count": 10000}, }, + "rc_joins": { + "local": {"per_second": 10000, "burst_count": 10000}, + "remote": {"per_second": 10000, "burst_count": 10000}, + }, "saml2_enabled": False, "public_baseurl": None, "default_identity_server": None,