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 remote-tracking branch 'upstream/develop' into send_sni_for_federation_requests

Browse source 
# Conflicts:
#	synapse/crypto/context_factory.py
This commit is contained in:
Jeroen 2018-07-14 20:24:46 +02:00
commit 505530f36a
347 changed files with 2249 additions and 2123 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tests/utils.py
View file

@ -15,9 +15,10 @@
import hashlib
from inspect import getcallargs
from six.moves.urllib import parse as urlparse
from mock import Mock, patch
from six.moves.urllib import parse as urlparse
from twisted.internet import defer, reactor
from synapse.api.errors import CodeMessageException, cs_error
@ -64,6 +65,7 @@ def setup_test_homeserver(name="test", datastore=None, config=None, reactor=None
config.federation_domain_whitelist = None
config.federation_rc_reject_limit = 10
config.federation_rc_sleep_limit = 10
config.federation_rc_sleep_delay = 100
config.federation_rc_concurrent = 10
config.filter_timeline_limit = 5000
config.user_directory_search_all_users = False