diff options
author | Maximilian Hils <git@maximilianhils.com> | 2014-09-08 12:20:40 +0200 |
---|---|---|
committer | Maximilian Hils <git@maximilianhils.com> | 2014-09-08 12:20:40 +0200 |
commit | 2b2d21aff0bbde86df2fc85fe505f1716bf7b79e (patch) | |
tree | a561cb0ec881b5464846cad649820af2bb143f5d /test/test_server.py | |
parent | 8eff2df89e5be8415aeda526e70e10e023ac1b05 (diff) | |
download | mitmproxy-2b2d21aff0bbde86df2fc85fe505f1716bf7b79e.tar.gz mitmproxy-2b2d21aff0bbde86df2fc85fe505f1716bf7b79e.tar.bz2 mitmproxy-2b2d21aff0bbde86df2fc85fe505f1716bf7b79e.zip |
add --ignore ui indication
Diffstat (limited to 'test/test_server.py')
-rw-r--r-- | test/test_server.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/test_server.py b/test/test_server.py index b128d0a2..0ce5d056 100644 --- a/test/test_server.py +++ b/test/test_server.py @@ -1,5 +1,5 @@ import socket, time -from libmproxy.proxy.config import ProxyConfig +from libmproxy.proxy.config import parse_host_pattern from netlib import tcp, http_auth, http from libpathod import pathoc, pathod from netlib.certutils import SSLCert @@ -79,8 +79,8 @@ class CommonMixin: class TcpMixin: def _ignore_on(self): - conf = ProxyConfig(ignore=[".+:%s" % self.server.port]) - self.config.ignore.append(conf.ignore[0]) + ignore = parse_host_pattern([".+:%s" % self.server.port])[0] + self.config.ignore.append(ignore) def _ignore_off(self): self.config.ignore.pop() @@ -581,9 +581,9 @@ class TestUpstreamProxySSL(tservers.HTTPUpstreamProxTest, CommonMixin, TcpMixin) def _ignore_on(self): super(TestUpstreamProxySSL, self)._ignore_on() - conf = ProxyConfig(ignore=[".+:%s" % self.server.port]) + ignore = parse_host_pattern([".+:%s" % self.server.port])[0] for proxy in self.chain: - proxy.tmaster.server.config.ignore.append(conf.ignore[0]) + proxy.tmaster.server.config.ignore.append(ignore) def _ignore_off(self): super(TestUpstreamProxySSL, self)._ignore_off() |