diff options
author | Erik Johnston <erik@matrix.org> | 2019-01-24 18:52:34 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2019-01-24 18:52:34 +0000 |
commit | efb8ed1d453fc9f76f9e9225532281963b7ea53c (patch) | |
tree | 62626873812dfce5f24b556b406b47a47159b214 /tests/utils.py | |
parent | Replace missed usages of FrozenEvent (diff) | |
parent | Merge pull request #4448 from matrix-org/erikj/get_pdu_versions (diff) | |
download | synapse-efb8ed1d453fc9f76f9e9225532281963b7ea53c.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/require_format_version
Diffstat (limited to 'tests/utils.py')
-rw-r--r-- | tests/utils.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/utils.py b/tests/utils.py index 1aa8f98094..2dfcb70a93 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 |