aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorThomas Kriechbaumer <thomas@kriechbaumer.name>2016-12-21 23:22:14 +0100
committerThomas Kriechbaumer <thomas@kriechbaumer.name>2016-12-21 23:22:14 +0100
commit24751965f99daf83c82d9c1581f712ca24da9d3d (patch)
tree82372bd4cf37a946fac69ccbb8072e417999d473 /test
parenta196493a7a43ae45c4f6164b63513e670906acba (diff)
downloadmitmproxy-24751965f99daf83c82d9c1581f712ca24da9d3d.tar.gz
mitmproxy-24751965f99daf83c82d9c1581f712ca24da9d3d.tar.bz2
mitmproxy-24751965f99daf83c82d9c1581f712ca24da9d3d.zip
remove output of dumper during tests
Diffstat (limited to 'test')
-rw-r--r--test/mitmproxy/test_tools_dump.py3
-rw-r--r--test/mitmproxy/test_web_app.py3
2 files changed, 3 insertions, 3 deletions
diff --git a/test/mitmproxy/test_tools_dump.py b/test/mitmproxy/test_tools_dump.py
index 1488f33b..2e64d2d2 100644
--- a/test/mitmproxy/test_tools_dump.py
+++ b/test/mitmproxy/test_tools_dump.py
@@ -11,7 +11,8 @@ from . import mastertest
class TestDumpMaster(mastertest.MasterTest):
def mkmaster(self, flt, **options):
o = dump.Options(filtstr=flt, verbosity=-1, flow_detail=0, **options)
- return dump.DumpMaster(o, proxy.DummyServer())
+ m = dump.DumpMaster(o, proxy.DummyServer(), with_termlog=False, with_dumper=False)
+ return m
def test_read(self):
with tutils.tmpdir() as t:
diff --git a/test/mitmproxy/test_web_app.py b/test/mitmproxy/test_web_app.py
index 8c15968b..61cf6993 100644
--- a/test/mitmproxy/test_web_app.py
+++ b/test/mitmproxy/test_web_app.py
@@ -19,8 +19,7 @@ def json(resp: httpclient.HTTPResponse):
class TestApp(tornado.testing.AsyncHTTPTestCase):
def get_app(self):
o = options.Options()
- m = webmaster.WebMaster(o, proxy.DummyServer())
- m.addons.remove(m.addons.get('termlog'))
+ m = webmaster.WebMaster(o, proxy.DummyServer(), with_termlog=False)
f = tflow.tflow(resp=True)
f.id = "42"
m.view.add(f)