summary refs log tree commit diff
path: root/tests
diff options
context:
space:
mode:
authorAmber Brown <hawkowl@atleastfornow.net>2019-03-11 21:12:30 +1100
committerAmber Brown <hawkowl@atleastfornow.net>2019-03-11 21:12:30 +1100
commit30a8deeb68a94e3aca2fa3f863de1b6d28ce2b14 (patch)
tree3ed918908fb7e7572c6f2c6d7244262b365e4444 /tests
parentinitial (diff)
parentMerge pull request #4839 from matrix-org/anoa/no_captcha_tests (diff)
downloadsynapse-30a8deeb68a94e3aca2fa3f863de1b6d28ce2b14.tar.xz
Merge remote-tracking branch 'origin/develop' into hawkowl/userdir-search
Diffstat (limited to 'tests')
-rw-r--r--tests/utils.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/utils.py b/tests/utils.py

index e4c42f9fa8..9c8dc9dbce 100644 --- a/tests/utils.py +++ b/tests/utils.py
@@ -115,6 +115,7 @@ def default_config(name): config.signing_key = [MockKey()] config.event_cache_size = 1 config.enable_registration = True + config.enable_registration_captcha = False config.macaroon_secret_key = "not even a little secret" config.expire_access_token = False config.server_name = name