Skip to content
Snippets Groups Projects
Commit 495e859e authored by Erik Johnston's avatar Erik Johnston
Browse files

Merge branch 'erikj/fix_config_ratelimiting' into erikj/test

parents ae69a6aa db3046f5
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
changelog.d/5185.misc 0 → 100644
+ 1
− 0
View file @ 495e859e
Update tests to consistently be configured via the same code that is used when loading from configuration files.
tests/utils.py
+ 2
− 1
View file @ 495e859e
...@@ -156,7 +156,8 @@ def default_config(name, parse=False): ...@@ -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},
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment