diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/test_server.py | 1 | ||||
| -rw-r--r-- | test/tservers.py | 10 |
2 files changed, 8 insertions, 3 deletions
diff --git a/test/test_server.py b/test/test_server.py index 017faacb..52efa5f2 100644 --- a/test/test_server.py +++ b/test/test_server.py @@ -175,6 +175,7 @@ class TestHTTPAuth(tservers.HTTPProxTest): class TestHTTPConnectSSLError(tservers.HTTPProxTest): certfile = True def test_go(self): + self.config.ssl_ports.append(self.proxy.port) p = self.pathoc_raw() dst = ("localhost", self.proxy.port) p.connect(connect_to=dst) diff --git a/test/tservers.py b/test/tservers.py index 597ad4ee..a12a440e 100644 --- a/test/tservers.py +++ b/test/tservers.py @@ -95,6 +95,7 @@ class ProxTestBase(object): confdir = cls.confdir, authenticator = cls.authenticator, certforward = cls.certforward, + ssl_ports=([cls.server.port, cls.server2.port] if cls.ssl else []), **pconf ) tmaster = cls.masterclass(cls.config) @@ -267,17 +268,20 @@ class ChainProxTest(ProxTestBase): Chain n instances of mitmproxy in a row - because we can. """ n = 2 - chain_config = [lambda port: ProxyConfig( + chain_config = [lambda port, sslports: ProxyConfig( upstream_server= (False, False, "127.0.0.1", port), http_form_in = "absolute", - http_form_out = "absolute" + http_form_out = "absolute", + ssl_ports=sslports )] * n @classmethod def setupAll(cls): super(ChainProxTest, cls).setupAll() cls.chain = [] for i in range(cls.n): - config = cls.chain_config[i](cls.proxy.port if i == 0 else cls.chain[-1].port) + sslports = [cls.server.port, cls.server2.port] + config = cls.chain_config[i](cls.proxy.port if i == 0 else cls.chain[-1].port, + sslports) tmaster = cls.masterclass(config) tmaster.start_app(APP_HOST, APP_PORT, cls.externalapp) cls.chain.append(ProxyThread(tmaster)) |