diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-08-10 12:23:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-10 12:23:54 +0100 |
| commit | 3c0213a21754c9ad8f9309d7548284dd08302a92 (patch) | |
| tree | bc9f07fdeb29929d3601afbe9a5891d932e519f8 /tests/utils.py | |
| parent | Merge pull request #3655 from matrix-org/neilj/disable_hs (diff) | |
| parent | more generic conversion of str/bytes to unicode (diff) | |
| download | synapse-3c0213a21754c9ad8f9309d7548284dd08302a92.tar.xz | |
Merge pull request #3439 from vojeroen/send_sni_for_federation_requests
send SNI for federation requests
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 3f17304934..8d73797971 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -127,6 +127,7 @@ def setup_test_homeserver(name="test", datastore=None, config=None, reactor=None database_engine=db_engine, room_list_handler=object(), tls_server_context_factory=Mock(), + tls_client_options_factory=Mock(), reactor=reactor, **kargs ) @@ -147,6 +148,7 @@ def setup_test_homeserver(name="test", datastore=None, config=None, reactor=None database_engine=db_engine, room_list_handler=object(), tls_server_context_factory=Mock(), + tls_client_options_factory=Mock(), reactor=reactor, **kargs ) |