summary refs log tree commit diff
path: root/tests/utils.py
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2018-08-08 15:55:47 +0000
committerGitHub <noreply@github.com>2018-08-08 15:55:47 +0000
commitd2f3ef98ac21929805f63a8a4964c3b97a22d1e1 (patch)
tree7eac0a444d3b04cb11d49a28b0d61a7c4f795d2d /tests/utils.py
parentAbility to disable client/server Synapse via conf toggle (diff)
parentMerge pull request #3662 from matrix-org/neilj/reserved_users (diff)
downloadsynapse-d2f3ef98ac21929805f63a8a4964c3b97a22d1e1.tar.xz
Merge branch 'develop' into neilj/disable_hs
Diffstat (limited to 'tests/utils.py')
-rw-r--r--tests/utils.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/utils.py b/tests/utils.py
index a0aa38d264..5e4d77920c 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -76,6 +76,8 @@ def setup_test_homeserver(name="test", datastore=None, config=None, reactor=None
         config.limit_usage_by_mau = False
         config.hs_disabled = False
         config.hs_disabled_message = ""
+        config.max_mau_value = 50
+        config.mau_limits_reserved_threepids = []
 
         # disable user directory updates, because they get done in the
         # background, which upsets the test runner.