diff options
| author | ikoz <john@kozyrakis.gr> | 2016-03-16 18:43:51 +0000 |
|---|---|---|
| committer | ikoz <john@kozyrakis.gr> | 2016-03-16 18:43:51 +0000 |
| commit | d26c7f4ca58165377f60d68babd47cf7e9377b3e (patch) | |
| tree | 16b9fc325890c261c6d11c931779a2b69e2aa837 | |
| parent | efc3e942d5444dc345ae3f65d1e08f9a3b6313b1 (diff) | |
| download | mitmproxy-d26c7f4ca58165377f60d68babd47cf7e9377b3e.tar.gz mitmproxy-d26c7f4ca58165377f60d68babd47cf7e9377b3e.tar.bz2 mitmproxy-d26c7f4ca58165377f60d68babd47cf7e9377b3e.zip | |
Move more init things inside AddServerCertsToClientChainMixin
| -rw-r--r-- | test/mitmproxy/test_server.py | 33 |
1 files changed, 13 insertions, 20 deletions
diff --git a/test/mitmproxy/test_server.py b/test/mitmproxy/test_server.py index 560c7b34..a2d1a578 100644 --- a/test/mitmproxy/test_server.py +++ b/test/mitmproxy/test_server.py @@ -1003,6 +1003,15 @@ class TestProxyChainingSSLReconnect(tservers.HTTPUpstreamProxyTest): class AddServerCertsToClientChainMixin: + ssl = True + servercert = tutils.test_data.path("data/trusted-server.crt") + ssloptions = pathod.SSLOptions( + cn="trusted-cert", + certs=[ + ("trusted-cert", servercert) + ] + ) + def test_add_server_certs_to_client_chain(self): with open(self.servercert, "rb") as f: d = f.read() @@ -1016,33 +1025,17 @@ class AddServerCertsToClientChainMixin: assert(server_cert_found_in_client_chain == self.add_server_certs_to_client_chain) -class TestHTTPSAddServerCertsToClientChainTrue(tservers.HTTPProxyTest, AddServerCertsToClientChainMixin): +class TestHTTPSAddServerCertsToClientChainTrue(AddServerCertsToClientChainMixin, tservers.HTTPProxyTest): """ - If --add-server-certs-to-client-chain is True, then the client should receive the server's certificates + If --add-server-certs-to-client-chain is True, then the client should receive the upstream server's certificates """ add_server_certs_to_client_chain = True - ssl = True - servercert = tutils.test_data.path("data/trusted-server.crt") - ssloptions = pathod.SSLOptions( - cn="trusted-cert", - certs=[ - ("trusted-cert", servercert) - ] - ) -class TestHTTPSAddServerCertsToClientChainFalse(tservers.HTTPProxyTest, AddServerCertsToClientChainMixin): +class TestHTTPSAddServerCertsToClientChainFalse(AddServerCertsToClientChainMixin, tservers.HTTPProxyTest): """ - If --add-server-certs-to-client-chain is False, then the client should not receive the server's certificates + If --add-server-certs-to-client-chain is False, then the client should not receive the upstream server's certificates """ add_server_certs_to_client_chain = False - ssl = True - servercert = tutils.test_data.path("data/trusted-server.crt") - ssloptions = pathod.SSLOptions( - cn="trusted-cert", - certs=[ - ("trusted-cert", servercert) - ] - ) |