summary refs log tree commit diff
path: root/tests
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@arasphere.net>2018-01-22 13:57:22 +0000
committerGitHub <noreply@github.com>2018-01-22 13:57:22 +0000
commitd84f65255e770c3fe513ed6418081b4fba264649 (patch)
treed825aad8fc1ea2ae6934ae4b21b25916ef6e8d86 /tests
parentMerge pull request #2814 from matrix-org/rav/fix_urlcache_thumbs (diff)
parentfix typo (thanks sytest) (diff)
downloadsynapse-d84f65255e770c3fe513ed6418081b4fba264649.tar.xz
Merge pull request #2813 from matrix-org/matthew/registrations_require_3pid
add registrations_require_3pid and allow_local_3pids
Diffstat (limited to 'tests')
-rw-r--r--tests/rest/client/v2_alpha/test_register.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/rest/client/v2_alpha/test_register.py b/tests/rest/client/v2_alpha/test_register.py
index 096f771bea..8aba456510 100644
--- a/tests/rest/client/v2_alpha/test_register.py
+++ b/tests/rest/client/v2_alpha/test_register.py
@@ -49,6 +49,7 @@ class RegisterRestServletTestCase(unittest.TestCase):
         self.hs.get_auth_handler = Mock(return_value=self.auth_handler)
         self.hs.get_device_handler = Mock(return_value=self.device_handler)
         self.hs.config.enable_registration = True
+        self.hs.config.registrations_require_3pid = []
         self.hs.config.auto_join_rooms = []
 
         # init the thing we're testing