aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@corte.si>2018-02-26 09:43:15 +1300
committerAldo Cortesi <aldo@corte.si>2018-02-26 09:43:15 +1300
commite5cdc20eb8cd8ebf5ab0ab8bd5ae9889054821df (patch)
tree39adf4bc6f7ecd191c74d994f47f3f2053359ac2 /test
parent2fb85553cc57e9559ed6ea747b3043b6f87bf36e (diff)
downloadmitmproxy-e5cdc20eb8cd8ebf5ab0ab8bd5ae9889054821df.tar.gz
mitmproxy-e5cdc20eb8cd8ebf5ab0ab8bd5ae9889054821df.tar.bz2
mitmproxy-e5cdc20eb8cd8ebf5ab0ab8bd5ae9889054821df.zip
Split dumper_filter off from view_filter
These don't even do the same thing.
Diffstat (limited to 'test')
-rw-r--r--test/mitmproxy/addons/test_dumper.py6
-rw-r--r--test/mitmproxy/tools/test_dump.py6
2 files changed, 6 insertions, 6 deletions
diff --git a/test/mitmproxy/addons/test_dumper.py b/test/mitmproxy/addons/test_dumper.py
index 7c54ab88..228bacf8 100644
--- a/test/mitmproxy/addons/test_dumper.py
+++ b/test/mitmproxy/addons/test_dumper.py
@@ -15,7 +15,7 @@ from mitmproxy import http
def test_configure():
d = dumper.Dumper()
with taddons.context(d) as ctx:
- ctx.configure(d, view_filter="~b foo")
+ ctx.configure(d, dumper_filter="~b foo")
assert d.filter
f = tflow.tflow(resp=True)
@@ -23,10 +23,10 @@ def test_configure():
f.response.content = b"foo"
assert d.match(f)
- ctx.configure(d, view_filter=None)
+ ctx.configure(d, dumper_filter=None)
assert not d.filter
with pytest.raises(exceptions.OptionsError):
- ctx.configure(d, view_filter="~~")
+ ctx.configure(d, dumper_filter="~~")
assert not d.filter
diff --git a/test/mitmproxy/tools/test_dump.py b/test/mitmproxy/tools/test_dump.py
index 9e67f420..f950d719 100644
--- a/test/mitmproxy/tools/test_dump.py
+++ b/test/mitmproxy/tools/test_dump.py
@@ -10,13 +10,13 @@ from .. import tservers
class TestDumpMaster(tservers.MasterTest):
- def mkmaster(self, flt, **opts):
- o = options.Options(view_filter=flt, **opts)
+ def mkmaster(self, **opts):
+ o = options.Options(**opts)
m = dump.DumpMaster(o, with_termlog=False, with_dumper=False)
return m
def test_has_error(self):
- m = self.mkmaster(None)
+ m = self.mkmaster()
ent = log.LogEntry("foo", "error")
ent.reply = controller.DummyReply()
m.addons.trigger("log", ent)