aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2016-07-19 15:19:58 +1200
committerAldo Cortesi <aldo@nullcube.com>2016-07-19 16:25:09 +1200
commit9c9d28d068d5c0aadea2baf10b48435f6283d659 (patch)
tree41a322456f55f8a87b41aba0489cb990846bbfd2 /test
parentef380917a89d18d684c03269bae77f6d53dcc1b8 (diff)
downloadmitmproxy-9c9d28d068d5c0aadea2baf10b48435f6283d659.tar.gz
mitmproxy-9c9d28d068d5c0aadea2baf10b48435f6283d659.tar.bz2
mitmproxy-9c9d28d068d5c0aadea2baf10b48435f6283d659.zip
Remove proxy.config.process_proxy_options
Diffstat (limited to 'test')
-rw-r--r--test/mitmproxy/test_proxy.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/mitmproxy/test_proxy.py b/test/mitmproxy/test_proxy.py
index 4127a889..7095d9d2 100644
--- a/test/mitmproxy/test_proxy.py
+++ b/test/mitmproxy/test_proxy.py
@@ -4,10 +4,10 @@ from OpenSSL import SSL
from mitmproxy import cmdline
from mitmproxy.proxy import ProxyConfig
-from mitmproxy.proxy.config import process_proxy_options
from mitmproxy.models.connections import ServerConnection
from mitmproxy.proxy.server import DummyServer, ProxyServer, ConnectionHandler
from mitmproxy.flow import options
+from mitmproxy.proxy import config
from netlib.exceptions import TcpDisconnect
from pathod import test
from netlib.http import http1
@@ -61,7 +61,7 @@ class TestProcessProxyOptions:
cmdline.common_options(parser)
args = parser.parse_args(args=args)
opts = cmdline.get_common_options(args)
- pconf = process_proxy_options(parser, options.Options(**opts), args)
+ pconf = config.ProxyConfig(options.Options(**opts))
return parser, pconf
def assert_err(self, err, *args):