py3++

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)
 
diff --git a/tox.ini b/tox.ini
index 29414486..e33fa4e0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -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]