summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndrew Morgan <1342360+anoadragon453@users.noreply.github.com>2019-03-11 09:58:43 +0000
committerGitHub <noreply@github.com>2019-03-11 09:58:43 +0000
commitb61ac9660a98d5a0e3f844c34059fcfefbf3cd3c (patch)
tree1a25d6daa0114cc1dbb14e050c435633c161a1c0
parentfix incorrect encoding of filenames with spaces in (#2090) (diff)
parentAdd changelog (diff)
downloadsynapse-b61ac9660a98d5a0e3f844c34059fcfefbf3cd3c.tar.xz
Merge pull request #4839 from matrix-org/anoa/no_captcha_tests
Disable captcha registration by default in tests
-rw-r--r--changelog.d/4839.misc1
-rw-r--r--tests/utils.py1
2 files changed, 2 insertions, 0 deletions
diff --git a/changelog.d/4839.misc b/changelog.d/4839.misc
new file mode 100644
index 0000000000..7c6868051b
--- /dev/null
+++ b/changelog.d/4839.misc
@@ -0,0 +1 @@
+Disable captcha registration by default in unit tests.
\ No newline at end of file
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