summary refs log tree commit diff
path: root/tests/utils.py
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2018-08-17 14:34:10 +0100
committerNeil Johnson <neil@matrix.org>2018-08-17 14:34:10 +0100
commit3ee57bdcbba4d9c90d6ac0f8a14baf9ca210ae18 (patch)
treeac129344d773907ebd7b989b56436140f09e1e2c /tests/utils.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not... (diff)
parentMerge pull request #3707 from matrix-org/neilj/limit_exceeded_error (diff)
downloadsynapse-3ee57bdcbba4d9c90d6ac0f8a14baf9ca210ae18.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_notices_on_blocking
Diffstat (limited to '')
-rw-r--r--tests/utils.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/utils.py b/tests/utils.py
index 52326d4f67..6f8b1de3e7 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -137,6 +137,7 @@ def setup_test_homeserver(
         config.limit_usage_by_mau = False
         config.hs_disabled = False
         config.hs_disabled_message = ""
+        config.hs_disabled_limit_type = ""
         config.max_mau_value = 50
         config.mau_limits_reserved_threepids = []
         config.admin_uri = None