diff options
author | Neil Johnson <neil@matrix.org> | 2018-08-15 13:52:25 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-15 13:52:25 +0000 |
commit | 4601129c449824669d8f187f5da83124b522bc93 (patch) | |
tree | 362d8bf8f2b049d8ce271ffbd3f64d3c910b4720 /tests/utils.py | |
parent | Merge pull request #3690 from matrix-org/neilj/change_prometheus_mau_metric_name (diff) | |
parent | remove changelog referencing another PR (diff) | |
download | synapse-4601129c449824669d8f187f5da83124b522bc93.tar.xz |
Merge pull request #3687 from matrix-org/neilj/admin_email
support admin_email config and pass through into blocking errors,
Diffstat (limited to 'tests/utils.py')
-rw-r--r-- | tests/utils.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/utils.py b/tests/utils.py index 90378326f8..52326d4f67 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -139,6 +139,7 @@ def setup_test_homeserver( config.hs_disabled_message = "" config.max_mau_value = 50 config.mau_limits_reserved_threepids = [] + config.admin_uri = None # we need a sane default_room_version, otherwise attempts to create rooms will # fail. |