diff options
| author | Amber Brown <hawkowl@atleastfornow.net> | 2018-05-22 10:50:26 -0500 |
|---|---|---|
| committer | Amber Brown <hawkowl@atleastfornow.net> | 2018-05-22 10:50:26 -0500 |
| commit | a8990fa2ec98ea14493515a92d6228729024409b (patch) | |
| tree | a0ce94c793d02e80ac95ec43a16c3b11a1884efa /tests/utils.py | |
| parent | rest of the changes (diff) | |
| parent | Merge pull request #3262 from matrix-org/rav/has_already_consented (diff) | |
| download | synapse-a8990fa2ec98ea14493515a92d6228729024409b.tar.xz | |
Merge remote-tracking branch 'origin/develop' into 3218-official-prom
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. |