aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2016-06-04 16:29:54 +1200
committerAldo Cortesi <aldo@nullcube.com>2016-06-04 19:07:27 +1200
commitd5532319c1fef4b10146f8643f9a02a7f948d446 (patch)
treeeb188d656676463dc3365e72d7b1d282a81e063d /test
parentaf63a3e064f51db986a84dfc38bd1b136812eae8 (diff)
downloadmitmproxy-d5532319c1fef4b10146f8643f9a02a7f948d446.tar.gz
mitmproxy-d5532319c1fef4b10146f8643f9a02a7f948d446.tar.bz2
mitmproxy-d5532319c1fef4b10146f8643f9a02a7f948d446.zip
Basic ConsoleMaster tests, based on mastertester
Diffstat (limited to 'test')
-rw-r--r--test/mitmproxy/console/test_master.py (renamed from test/mitmproxy/console/test_console.py)14
1 files changed, 13 insertions, 1 deletions
diff --git a/test/mitmproxy/console/test_console.py b/test/mitmproxy/console/test_master.py
index 52d2c49a..33261c28 100644
--- a/test/mitmproxy/console/test_console.py
+++ b/test/mitmproxy/console/test_master.py
@@ -4,7 +4,7 @@ import netlib.tutils
from mitmproxy import console
from mitmproxy.console import common
-from .. import tutils
+from .. import tutils, mastertest
class TestConsoleState:
@@ -108,3 +108,15 @@ def test_format_keyvals():
def test_options():
assert console.master.Options(kill=True)
+
+
+class TestMaster(mastertest.MasterTest):
+ def mkmaster(self, filt, **options):
+ 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, "")
+ assert len(m.state.flows) == i