From f7639e077ab10dc8e7f180f44b531b9ad35c060b Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Fri, 8 Jul 2016 15:58:12 -0700 Subject: py3++ --- test/mitmproxy/console/test_master.py | 4 +++- test/mitmproxy/test_dump.py | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'test') diff --git a/test/mitmproxy/console/test_master.py b/test/mitmproxy/console/test_master.py index 33261c28..d42863b3 100644 --- a/test/mitmproxy/console/test_master.py +++ b/test/mitmproxy/console/test_master.py @@ -112,11 +112,13 @@ def test_options(): class TestMaster(mastertest.MasterTest): def mkmaster(self, filt, **options): + if "verbosity" not in options: + options["verbosity"] = 0 o = console.master.Options(filtstr=filt, **options) return console.master.ConsoleMaster(None, o) def test_basic(self): m = self.mkmaster(None) for i in (1, 2, 3): - self.dummy_cycle(m, 1, "") + self.dummy_cycle(m, 1, b"") assert len(m.state.flows) == i diff --git a/test/mitmproxy/test_dump.py b/test/mitmproxy/test_dump.py index 234490f8..18de09d5 100644 --- a/test/mitmproxy/test_dump.py +++ b/test/mitmproxy/test_dump.py @@ -63,6 +63,8 @@ class TestDumpMaster(mastertest.MasterTest): def mkmaster(self, filt, **options): cs = StringIO() + if "verbosity" not in options: + options["verbosity"] = 0 o = dump.Options(filtstr=filt, **options) return dump.DumpMaster(None, o, outfile=cs) -- cgit v1.2.3