diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2016-07-18 15:40:40 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2016-07-19 16:25:09 +1200 |
| commit | 856e1c2ba938c6fb7639286cb27ae5cf3f63e2c8 (patch) | |
| tree | fb80ed762ccfeed45f5958c36433d44b29970467 /test | |
| parent | b1b1a1b9cfad24d62ffc5bf0613927fadd7bc77e (diff) | |
| download | mitmproxy-856e1c2ba938c6fb7639286cb27ae5cf3f63e2c8.tar.gz mitmproxy-856e1c2ba938c6fb7639286cb27ae5cf3f63e2c8.tar.bz2 mitmproxy-856e1c2ba938c6fb7639286cb27ae5cf3f63e2c8.zip | |
Move clientcers & cadir to Options
Also adds a .configure mechanism to ProxyConfig, and hooks it up to the change
event.
Diffstat (limited to 'test')
| -rw-r--r-- | test/mitmproxy/test_proxy.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/test/mitmproxy/test_proxy.py b/test/mitmproxy/test_proxy.py index c87e1ad4..70ddfd40 100644 --- a/test/mitmproxy/test_proxy.py +++ b/test/mitmproxy/test_proxy.py @@ -60,7 +60,9 @@ class TestProcessProxyOptions: parser = tutils.MockParser() cmdline.common_options(parser) args = parser.parse_args(args=args) - return parser, process_proxy_options(parser, options.Options(), args) + opts = cmdline.get_common_options(args) + pconf = process_proxy_options(parser, options.Options(**opts), args) + return parser, pconf def assert_err(self, err, *args): tutils.raises(err, self.p, *args) |