diff options
| author | Erik Johnston <erik@matrix.org> | 2019-05-14 14:42:47 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-05-14 14:42:47 +0100 |
| commit | 495e859e580a458055d5b12417583b39dba8e067 (patch) | |
| tree | 55b716f28f98153e618ece1868dfeb53d9772780 | |
| parent | Merge branch 'erikj/async_serialize_event' into erikj/reactions_rebase (diff) | |
| parent | Newsfile (diff) | |
| download | synapse-495e859e580a458055d5b12417583b39dba8e067.tar.xz | |
Merge branch 'erikj/fix_config_ratelimiting' into erikj/test
| -rw-r--r-- | changelog.d/5185.misc | 1 | ||||
| -rw-r--r-- | tests/utils.py | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/changelog.d/5185.misc b/changelog.d/5185.misc new file mode 100644 index 0000000000..d148b03b51 --- /dev/null +++ b/changelog.d/5185.misc @@ -0,0 +1 @@ +Update tests to consistently be configured via the same code that is used when loading from configuration files. diff --git a/tests/utils.py b/tests/utils.py index f21074ae28..f38533a0c7 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -156,7 +156,8 @@ def default_config(name, parse=False): "mau_stats_only": False, "mau_limits_reserved_threepids": [], "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_login": { "address": {"per_second": 10000, "burst_count": 10000}, |