summary refs log tree commit diff
path: root/tests/http/test_proxyagent.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2021-04-23 13:37:49 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2021-04-23 13:39:50 +0100
commit2036503c9e24198df36e2beca1d8aa8571fc125b (patch)
tree67c4a212e4d26b609c6011597c3fee5e6b6c98b2 /tests/http/test_proxyagent.py
parentMerge commit '3d2acc930' into anoa/dinsic_release_1_31_0 (diff)
parentMerge tag 'v1.28.0rc1' into develop (diff)
downloadsynapse-2036503c9e24198df36e2beca1d8aa8571fc125b.tar.xz
Merge commit 'd9f1dccba' into anoa/dinsic_release_1_31_0
Diffstat (limited to 'tests/http/test_proxyagent.py')
-rw-r--r--tests/http/test_proxyagent.py15
1 files changed, 11 insertions, 4 deletions
diff --git a/tests/http/test_proxyagent.py b/tests/http/test_proxyagent.py

index 4e1a5a5138..34df39429b 100644 --- a/tests/http/test_proxyagent.py +++ b/tests/http/test_proxyagent.py
@@ -184,7 +184,9 @@ class MatrixFederationAgentTests(TestCase): ) def test_https_request_via_no_proxy(self): agent = ProxyAgent( - self.reactor, contextFactory=get_test_https_policy(), use_proxy=True, + self.reactor, + contextFactory=get_test_https_policy(), + use_proxy=True, ) self._test_request_direct_connection(agent, b"https", b"test.com", b"abc") @@ -196,7 +198,9 @@ class MatrixFederationAgentTests(TestCase): @patch.dict(os.environ, {"https_proxy": "proxy.com", "no_proxy": "*"}) def test_https_request_via_no_proxy_star(self): agent = ProxyAgent( - self.reactor, contextFactory=get_test_https_policy(), use_proxy=True, + self.reactor, + contextFactory=get_test_https_policy(), + use_proxy=True, ) self._test_request_direct_connection(agent, b"https", b"test.com", b"abc") @@ -252,10 +256,13 @@ class MatrixFederationAgentTests(TestCase): self._do_https_request_via_proxy(auth_credentials="bob:pinkponies") def _do_https_request_via_proxy( - self, auth_credentials: Optional[str] = None, + self, + auth_credentials: Optional[str] = None, ): agent = ProxyAgent( - self.reactor, contextFactory=get_test_https_policy(), use_proxy=True, + self.reactor, + contextFactory=get_test_https_policy(), + use_proxy=True, ) self.reactor.lookups["proxy.com"] = "1.2.3.5"