diff options
| author | Erik Johnston <erik@matrix.org> | 2019-01-25 09:57:01 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-01-25 10:07:08 +0000 |
| commit | 62514bb81bfa631d5aaaee7126f43ee0e6a7f828 (patch) | |
| tree | 69514e969311bdee344e51a524969c73c0fdb066 /tests/utils.py | |
| parent | Review comments (diff) | |
| parent | Merge pull request #4448 from matrix-org/erikj/get_pdu_versions (diff) | |
| download | synapse-62514bb81bfa631d5aaaee7126f43ee0e6a7f828.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/msc_1813
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 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 |