diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2018-02-10 12:40:39 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-10 12:40:39 +0100 |
| commit | cda7c8d754f6eb71dd059f2bdfe2805f31b02874 (patch) | |
| tree | 121566ac1344fad23b0af0bee71cbe102dffbcd7 /test | |
| parent | dc6552b79bea73f642f8ba3aa8c9ed5bdc70d1a5 (diff) | |
| parent | e4f70b795723c5e477198294f3bb8eae245b2b46 (diff) | |
| download | mitmproxy-cda7c8d754f6eb71dd059f2bdfe2805f31b02874.tar.gz mitmproxy-cda7c8d754f6eb71dd059f2bdfe2805f31b02874.tar.bz2 mitmproxy-cda7c8d754f6eb71dd059f2bdfe2805f31b02874.zip | |
Merge pull request #2851 from mhils/always-use-tls-settings
Use TLS options also for request replay
Diffstat (limited to 'test')
| -rw-r--r-- | test/mitmproxy/test_connections.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/test/mitmproxy/test_connections.py b/test/mitmproxy/test_connections.py index 9e5d89f1..00cdbc87 100644 --- a/test/mitmproxy/test_connections.py +++ b/test/mitmproxy/test_connections.py @@ -155,7 +155,7 @@ class TestServerConnection: def test_sni(self): c = connections.ServerConnection(('', 1234)) with pytest.raises(ValueError, matches='sni must be str, not '): - c.establish_tls(None, b'foobar') + c.establish_tls(sni=b'foobar') def test_state(self): c = tflow.tserver_conn() @@ -222,17 +222,16 @@ class TestServerConnectionTLS(tservers.ServerTestBase): def handle(self): self.finish() - @pytest.mark.parametrize("clientcert", [ + @pytest.mark.parametrize("client_certs", [ None, tutils.test_data.path("mitmproxy/data/clientcert"), tutils.test_data.path("mitmproxy/data/clientcert/client.pem"), ]) - def test_tls(self, clientcert): + def test_tls(self, client_certs): c = connections.ServerConnection(("127.0.0.1", self.port)) c.connect() - c.establish_tls(clientcert, "foo.com") + c.establish_tls(client_certs=client_certs) assert c.connected() - assert c.sni == "foo.com" assert c.tls_established c.close() c.finish() |