diff options
| author | Neil Johnson <neil@matrix.org> | 2018-08-31 16:31:48 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-31 16:31:48 +0000 |
| commit | 99178f86025f881b74b1a609a73d5920e701eddb (patch) | |
| tree | ae140eb5def07a0ecf98fd4e0178107e3ba6113c /tests/utils.py | |
| parent | Port storage/ to Python 3 (#3725) (diff) | |
| parent | assert rather than warn (diff) | |
| download | synapse-99178f86025f881b74b1a609a73d5920e701eddb.tar.xz | |
Merge pull request #3777 from matrix-org/neilj/fix_register_user_registration
fix bug where preserved threepid user comes to sign up and server is …
Diffstat (limited to 'tests/utils.py')
| -rw-r--r-- | tests/utils.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/utils.py b/tests/utils.py index 179b592501..63e30dc6c0 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -26,6 +26,7 @@ from twisted.internet import defer, reactor from synapse.api.constants import EventTypes from synapse.api.errors import CodeMessageException, cs_error +from synapse.config.server import ServerConfig from synapse.federation.transport import server from synapse.http.server import HttpServer from synapse.server import HomeServer @@ -158,6 +159,11 @@ def setup_test_homeserver( # background, which upsets the test runner. config.update_user_directory = False + def is_threepid_reserved(threepid): + return ServerConfig.is_threepid_reserved(config, threepid) + + config.is_threepid_reserved.side_effect = is_threepid_reserved + config.use_frozen_dicts = True config.ldap_enabled = False |