summary refs log tree commit diff
path: root/tests
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2019-01-24 13:02:50 +0000
committerGitHub <noreply@github.com>2019-01-24 13:02:50 +0000
commit10b89d5c2e994e280da6957af7560b2d84ce6048 (patch)
treee7756ca331a3b1ba775a87e8db4f715e8b10a68c /tests
parentMerge pull request #4458 from matrix-org/dbkr/public_baseurl_doc (diff)
parentmove guard out of is_threepid_reserved and into register.py (diff)
downloadsynapse-10b89d5c2e994e280da6957af7560b2d84ce6048.tar.xz
Merge pull request #4435 from matrix-org/neilj/fix_threepid_auth_check
Neilj/fix threepid auth check
Diffstat (limited to 'tests')
-rw-r--r--tests/utils.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/utils.py b/tests/utils.py

index 08d6faa0a6..df73c539c3 100644 --- a/tests/utils.py +++ b/tests/utils.py
@@ -154,7 +154,9 @@ def default_config(name): config.update_user_directory = False def is_threepid_reserved(threepid): - return ServerConfig.is_threepid_reserved(config, threepid) + return ServerConfig.is_threepid_reserved( + config.mau_limits_reserved_threepids, threepid + ) config.is_threepid_reserved.side_effect = is_threepid_reserved