summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@matrix.org>2018-11-03 12:58:25 +0000
committerMatthew Hodgson <matthew@matrix.org>2018-11-03 12:58:25 +0000
commit7ed3232b08805044ec5bfa2ed5c0bcd100338e8b (patch)
treec39ba1724f72750948b5eb6912289511e92dc7fb
parentmerge master into dinsic, again... (diff)
downloadsynapse-7ed3232b08805044ec5bfa2ed5c0bcd100338e8b.tar.xz
-rw-r--r--tests/test_mau.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/test_mau.py b/tests/test_mau.py
index bdbacb8448..59d50e54e1 100644
--- a/tests/test_mau.py
+++ b/tests/test_mau.py
@@ -63,6 +63,7 @@ class TestMauLimit(unittest.TestCase):
         self.hs.config.server_notices_mxid_display_name = None
         self.hs.config.server_notices_mxid_avatar_url = None
         self.hs.config.server_notices_room_name = "Test Server Notice Room"
+        self.hs.config.register_mxid_from_3pid = None
 
         self.resource = JsonResource(self.hs)
         register.register_servlets(self.hs, self.resource)