summary refs log tree commit diff
path: root/tests/utils.py
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2018-08-14 14:51:38 +0100
committerNeil Johnson <neil@matrix.org>2018-08-14 14:51:38 +0100
commit9b5bf3d8581408a417e680c3d5c118a368e51c20 (patch)
tree8e024ada77d93f547913d23e9ad20885d3632c0d /tests/utils.py
parentMerge branch 'neilj/mau_sync_block' of github.com:matrix-org/synapse into nei... (diff)
parentset admin email via config (diff)
downloadsynapse-9b5bf3d8581408a417e680c3d5c118a368e51c20.tar.xz
Merge branch 'neilj/admin_email' of github.com:matrix-org/synapse into neilj/fix_off_by_1+maus
Diffstat (limited to 'tests/utils.py')
-rw-r--r--tests/utils.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/utils.py b/tests/utils.py
index 90378326f8..4af81624eb 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_email = None
 
         # we need a sane default_room_version, otherwise attempts to create rooms will
         # fail.