diff options
author | Erik Johnston <erik@matrix.org> | 2018-05-23 10:54:14 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2018-05-23 10:54:14 +0100 |
commit | 6e11803ed3669fb897fe61da168eb033ad495198 (patch) | |
tree | 936c98227c65d687318c3d573a4c4a5a5fdb1e33 /tests/utils.py | |
parent | Merge pull request #3226 from matrix-org/erikj/chunk_base (diff) | |
parent | Merge pull request #3265 from matrix-org/erikj/limit_pagination (diff) | |
download | synapse-6e11803ed3669fb897fe61da168eb033ad495198.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/room_chunks
Diffstat (limited to 'tests/utils.py')
-rw-r--r-- | tests/utils.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/utils.py b/tests/utils.py index c2beb5d9f7..262c4a5714 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -63,6 +63,8 @@ def setup_test_homeserver(name="test", datastore=None, config=None, **kargs): config.federation_rc_concurrent = 10 config.filter_timeline_limit = 5000 config.user_directory_search_all_users = False + config.user_consent_server_notice_content = None + config.block_events_without_consent_error = None # disable user directory updates, because they get done in the # background, which upsets the test runner. |