From dc4f6d1b0104bb6d736deaec454640681bd31360 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Tue, 14 May 2019 14:37:40 +0100
Subject: [PATCH 1/2] Use correct config option for ratelimiting in tests

---
 tests/utils.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/utils.py b/tests/utils.py
index f21074ae2..f38533a0c 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},

From db3046f5657af0f4f512b7f9aeb0d424808c8663 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Tue, 14 May 2019 14:39:27 +0100
Subject: [PATCH 2/2] Newsfile

---
 changelog.d/5185.misc | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/5185.misc

diff --git a/changelog.d/5185.misc b/changelog.d/5185.misc
new file mode 100644
index 000000000..d148b03b5
--- /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.