aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@corte.si>2017-03-19 13:21:46 +1300
committerAldo Cortesi <aldo@corte.si>2017-03-19 13:21:46 +1300
commit22d7c31ea8cad01614debe674826841f843fd318 (patch)
treec8ab446c6276a013af9aa5dab73e1d38ebb15bb7 /test
parent475a4e3eb03e2a704f078e1bb7f11fd199b0bb52 (diff)
downloadmitmproxy-22d7c31ea8cad01614debe674826841f843fd318.tar.gz
mitmproxy-22d7c31ea8cad01614debe674826841f843fd318.tar.bz2
mitmproxy-22d7c31ea8cad01614debe674826841f843fd318.zip
dumper, mitmdump: kill filtstr
Dumper now also uses view_filter. Passing arguments to mitmdump is now precisely equivalent to setting both filestream_filter and view_filter.
Diffstat (limited to 'test')
-rw-r--r--test/mitmproxy/addons/test_dumper.py6
-rw-r--r--test/mitmproxy/tools/test_dump.py2
2 files changed, 4 insertions, 4 deletions
diff --git a/test/mitmproxy/addons/test_dumper.py b/test/mitmproxy/addons/test_dumper.py
index fbcc4d16..d2cefe79 100644
--- a/test/mitmproxy/addons/test_dumper.py
+++ b/test/mitmproxy/addons/test_dumper.py
@@ -16,7 +16,7 @@ from mitmproxy import options
def test_configure():
d = dumper.Dumper()
with taddons.context(options=options.Options()) as ctx:
- ctx.configure(d, filtstr="~b foo")
+ ctx.configure(d, view_filter="~b foo")
assert d.filter
f = tflow.tflow(resp=True)
@@ -24,10 +24,10 @@ def test_configure():
f.response.content = b"foo"
assert d.match(f)
- ctx.configure(d, filtstr=None)
+ ctx.configure(d, view_filter=None)
assert not d.filter
with pytest.raises(exceptions.OptionsError):
- ctx.configure(d, filtstr="~~")
+ ctx.configure(d, view_filter="~~")
assert not d.filter
diff --git a/test/mitmproxy/tools/test_dump.py b/test/mitmproxy/tools/test_dump.py
index 8e2fa5b2..69a76d2e 100644
--- a/test/mitmproxy/tools/test_dump.py
+++ b/test/mitmproxy/tools/test_dump.py
@@ -12,7 +12,7 @@ from .. import tservers
class TestDumpMaster(tservers.MasterTest):
def mkmaster(self, flt, **opts):
- o = options.Options(filtstr=flt, verbosity=-1, flow_detail=0, **opts)
+ o = options.Options(view_filter=flt, verbosity=-1, flow_detail=0, **opts)
m = dump.DumpMaster(o, proxy.DummyServer(), with_termlog=False, with_dumper=False)
return m