diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2016-07-18 14:50:10 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2016-07-19 16:25:09 +1200 |
| commit | b1b1a1b9cfad24d62ffc5bf0613927fadd7bc77e (patch) | |
| tree | a4846609d1e8e6c55a5dae2be0b5bfc048981968 /test | |
| parent | 6908dc4d901fbe23107253535596a14ed2691539 (diff) | |
| download | mitmproxy-b1b1a1b9cfad24d62ffc5bf0613927fadd7bc77e.tar.gz mitmproxy-b1b1a1b9cfad24d62ffc5bf0613927fadd7bc77e.tar.bz2 mitmproxy-b1b1a1b9cfad24d62ffc5bf0613927fadd7bc77e.zip | |
ProxyConfig: cadir to options
Diffstat (limited to 'test')
| -rw-r--r-- | test/mitmproxy/test_protocol_http2.py | 3 | ||||
| -rw-r--r-- | test/mitmproxy/tservers.py | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/test/mitmproxy/test_protocol_http2.py b/test/mitmproxy/test_protocol_http2.py index dd81ba23..34e6656a 100644 --- a/test/mitmproxy/test_protocol_http2.py +++ b/test/mitmproxy/test_protocol_http2.py @@ -105,10 +105,9 @@ class _Http2TestBase(object): @classmethod def get_proxy_config(cls): opts = options.Options(listen_port=0) - cls.cadir = os.path.join(tempfile.gettempdir(), "mitmproxy") + opts.cadir = os.path.join(tempfile.gettempdir(), "mitmproxy") d = dict( no_upstream_cert=False, - cadir=cls.cadir, authenticator=None, ) return d, opts diff --git a/test/mitmproxy/tservers.py b/test/mitmproxy/tservers.py index f9e1925f..ddb2922a 100644 --- a/test/mitmproxy/tservers.py +++ b/test/mitmproxy/tservers.py @@ -122,11 +122,10 @@ class ProxyTestBase(object): cls.cadir = os.path.join(tempfile.gettempdir(), "mitmproxy") cnf = dict( no_upstream_cert = cls.no_upstream_cert, - cadir = cls.cadir, authenticator = cls.authenticator, add_upstream_certs_to_client_chain = cls.add_upstream_certs_to_client_chain, ) - return cnf, options.Options(listen_port=0) + return cnf, options.Options(listen_port=0, cadir=cls.cadir) class HTTPProxyTest(ProxyTestBase): |