aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/mitmproxy/test_protocol_http2.py5
-rw-r--r--test/mitmproxy/tservers.py2
2 files changed, 2 insertions, 5 deletions
diff --git a/test/mitmproxy/test_protocol_http2.py b/test/mitmproxy/test_protocol_http2.py
index d910ecae..e8866643 100644
--- a/test/mitmproxy/test_protocol_http2.py
+++ b/test/mitmproxy/test_protocol_http2.py
@@ -104,10 +104,9 @@ class _Http2TestBase(object):
@classmethod
def get_proxy_config(cls):
- opts = options.Options(listen_port=0)
+ opts = options.Options(listen_port=0, no_upstream_cert=False)
opts.cadir = os.path.join(tempfile.gettempdir(), "mitmproxy")
d = dict(
- no_upstream_cert=False,
authenticator=None,
)
return d, opts
@@ -122,8 +121,6 @@ class _Http2TestBase(object):
self.server.server.handle_server_event = self.handle_server_event
def _setup_connection(self):
- self.config.http2 = True
-
client = netlib.tcp.TCPClient(("127.0.0.1", self.proxy.port))
client.connect()
diff --git a/test/mitmproxy/tservers.py b/test/mitmproxy/tservers.py
index 2bfc27e8..8df30e34 100644
--- a/test/mitmproxy/tservers.py
+++ b/test/mitmproxy/tservers.py
@@ -121,12 +121,12 @@ class ProxyTestBase(object):
def get_proxy_config(cls):
cls.cadir = os.path.join(tempfile.gettempdir(), "mitmproxy")
cnf = dict(
- no_upstream_cert = cls.no_upstream_cert,
authenticator = cls.authenticator,
)
return cnf, options.Options(
listen_port=0,
cadir=cls.cadir,
+ no_upstream_cert = cls.no_upstream_cert,
add_upstream_certs_to_client_chain=cls.add_upstream_certs_to_client_chain
)