summary refs log tree commit diff
path: root/tests/utils.py
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2019-01-22 16:52:29 +0000
committerNeil Johnson <neil@matrix.org>2019-01-22 16:52:29 +0000
commitd619b113edf2942185a502a91cbf5b51642f6814 (patch)
tree974689abd0c86e184934a8668d08bb59c19dabd2 /tests/utils.py
parentMerge pull request #4423 from matrix-org/neilj/disable_msisdn_on_registration (diff)
downloadsynapse-d619b113edf2942185a502a91cbf5b51642f6814.tar.xz
Fix None guard in config.server.is_threepid_reserved
Diffstat (limited to 'tests/utils.py')
-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