summary refs log tree commit diff
path: root/tests/utils.py
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2018-08-08 14:33:17 +0000
committerGitHub <noreply@github.com>2018-08-08 14:33:17 +0000
commitcc187debf3193054b736e7049ac2706f54c4de57 (patch)
tree3b9145795bff0076067070d7f1d4351cd7a622c3 /tests/utils.py
parentMerge pull request #3633 from matrix-org/neilj/mau_tracker (diff)
parentMerge branch 'develop' of github.com:matrix-org/synapse into neilj/reserved_u... (diff)
downloadsynapse-cc187debf3193054b736e7049ac2706f54c4de57.tar.xz
Merge pull request #3662 from matrix-org/neilj/reserved_users
Reserved users for MAU limits
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 ec40428e74..e7894819c0 100644 --- a/tests/utils.py +++ b/tests/utils.py
@@ -74,6 +74,8 @@ def setup_test_homeserver(name="test", datastore=None, config=None, reactor=None config.media_storage_providers = [] config.auto_join_rooms = [] config.limit_usage_by_mau = False + 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.