Merge branch 'develop' into neilj/disable_hs

This commit is contained in:
Neil Johnson 2018-08-08 15:55:47 +00:00 committed by GitHub
commit d2f3ef98ac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 115 additions and 7 deletions

View file

@ -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.