OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'erikj/fix_config_ratelimiting' into erikj/test

pull/5195/head
Erik Johnston 2019-05-14 14:42:47 +01:00
parent ae69a6aa9d db3046f565
commit 495e859e58
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/5185.misc Normal file
View File

@ -0,0 +1 @@
Update tests to consistently be configured via the same code that is used when loading from configuration files.

3
tests/utils.py
View File

@ -156,7 +156,8 @@ def default_config(name, parse=False):
"mau_stats_only": False, "mau_stats_only": False,
"mau_limits_reserved_threepids": [], "mau_limits_reserved_threepids": [],
"admin_contact": None, "admin_contact": None,
"rc_message": {"per_second": 10000, "burst_count": 10000}, "rc_messages_per_second": 10000,
"rc_message_burst_count": 10000,
"rc_registration": {"per_second": 10000, "burst_count": 10000}, "rc_registration": {"per_second": 10000, "burst_count": 10000},
"rc_login": { "rc_login": {
"address": {"per_second": 10000, "burst_count": 10000}, "address": {"per_second": 10000, "burst_count": 10000},