Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-02 22:14:55 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into send_sni_for_federation_requests

Browse source
This commit is contained in:
Richard van der Hoff 2018-07-27 09:17:11 +01:00 • committed by GitHub
commit 7041cd872b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
156 changed files with 7063 additions and 5235 deletions
Download patch file Download diff file Expand all files Collapse all files

3
tests/utils.py
View file

@ -71,6 +71,8 @@ def setup_test_homeserver(name="test", datastore=None, config=None, reactor=None
config.user_directory_search_all_users = False
config.user_consent_server_notice_content = None
config.block_events_without_consent_error = None
config.media_storage_providers = []
config.auto_join_rooms = []
# disable user directory updates, because they get done in the
# background, which upsets the test runner.
@ -138,6 +140,7 @@ def setup_test_homeserver(name="test", datastore=None, config=None, reactor=None
room_list_handler=object(),
tls_server_context_factory=Mock(),
tls_client_options_factory=Mock(),
reactor=reactor,
**kargs
)