summary refs log tree commit diff
path: root/tests/utils.py
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2018-08-09 10:41:43 +0000
committerGitHub <noreply@github.com>2018-08-09 10:41:43 +0000
commit0ad98e38d0c5f6fde18032551cccb291659b9204 (patch)
tree925f1657770ba47599169763dc1be02b6156923d /tests/utils.py
parentMerge branch 'master' into develop (diff)
parentfix pep8 too many lines (diff)
downloadsynapse-0ad98e38d0c5f6fde18032551cccb291659b9204.tar.xz
Merge pull request #3655 from matrix-org/neilj/disable_hs
Flag to disable HS without disabling federation
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 5d49692c58..3f17304934 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.hs_disabled = False
+        config.hs_disabled_message = ""
         config.max_mau_value = 50
         config.mau_limits_reserved_threepids = []