summary refs log tree commit diff
path: root/tests/utils.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-03-19 12:19:20 +0000
committerRichard van der Hoff <richard@matrix.org>2019-03-19 12:19:20 +0000
commit2561b628af267ab567118a3e40038504c60acf41 (patch)
treee283996a2db1e6fa540c1ae963ca7c03903d06cc /tests/utils.py
parentRevert "Reinstate EDU-batching hacks" (diff)
parentfix test_auto_create_auto_join_where_no_consent (#4886) (diff)
downloadsynapse-2561b628af267ab567118a3e40038504c60acf41.tar.xz
Merge branch 'develop' into matrix-org-hotfixes
Diffstat (limited to 'tests/utils.py')
-rw-r--r--tests/utils.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/tests/utils.py b/tests/utils.py

index 03b5a05b22..b58b674aa4 100644 --- a/tests/utils.py +++ b/tests/utils.py
@@ -151,8 +151,14 @@ def default_config(name): config.admin_contact = None config.rc_messages_per_second = 10000 config.rc_message_burst_count = 10000 - config.rc_registration_request_burst_count = 3.0 - config.rc_registration_requests_per_second = 0.17 + config.rc_registration.per_second = 10000 + config.rc_registration.burst_count = 10000 + config.rc_login_address.per_second = 10000 + config.rc_login_address.burst_count = 10000 + config.rc_login_account.per_second = 10000 + config.rc_login_account.burst_count = 10000 + config.rc_login_failed_attempts.per_second = 10000 + config.rc_login_failed_attempts.burst_count = 10000 config.saml2_enabled = False config.public_baseurl = None config.default_identity_server = None