diff options
author | Maximilian Hils <git@maximilianhils.com> | 2016-07-08 15:58:12 -0700 |
---|---|---|
committer | Maximilian Hils <git@maximilianhils.com> | 2016-07-08 15:58:12 -0700 |
commit | f7639e077ab10dc8e7f180f44b531b9ad35c060b (patch) | |
tree | 416b36cbc093bdb015258c6f9183e6f0c58511d8 | |
parent | 0a1431ed2c638ceb34308d38250eab2717640c49 (diff) | |
download | mitmproxy-f7639e077ab10dc8e7f180f44b531b9ad35c060b.tar.gz mitmproxy-f7639e077ab10dc8e7f180f44b531b9ad35c060b.tar.bz2 mitmproxy-f7639e077ab10dc8e7f180f44b531b9ad35c060b.zip |
py3++
-rw-r--r-- | test/mitmproxy/console/test_master.py | 4 | ||||
-rw-r--r-- | test/mitmproxy/test_dump.py | 2 | ||||
-rw-r--r-- | tox.ini | 2 |
3 files changed, 6 insertions, 2 deletions
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) @@ -16,7 +16,7 @@ commands = [testenv:py35] setenv = - TESTS = --ignore=test/mitmproxy/console/test_master.py --ignore=test/mitmproxy/test_dump.py test/ + TESTS = --ignore=test/mitmproxy/test_dump.py test/ HOME = {envtmpdir} [testenv:docs] |