diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/mitmproxy/addons/test_cut.py | 2 | ||||
| -rw-r--r-- | test/mitmproxy/addons/test_dumper.py | 2 | ||||
| -rw-r--r-- | test/mitmproxy/addons/test_termlog.py | 2 | ||||
| -rw-r--r-- | test/mitmproxy/test_connections.py | 2 | ||||
| -rw-r--r-- | test/mitmproxy/test_flowfilter.py | 14 | ||||
| -rw-r--r-- | test/mitmproxy/tools/console/test_master.py | 2 | ||||
| -rw-r--r-- | test/mitmproxy/tools/test_dump.py | 2 | ||||
| -rw-r--r-- | test/mitmproxy/tservers.py | 8 |
8 files changed, 19 insertions, 15 deletions
diff --git a/test/mitmproxy/addons/test_cut.py b/test/mitmproxy/addons/test_cut.py index e028331f..242c6c2f 100644 --- a/test/mitmproxy/addons/test_cut.py +++ b/test/mitmproxy/addons/test_cut.py @@ -32,7 +32,7 @@ def test_extract(): ["s.header[header-response]", "svalue"], ["cc.address.port", "22"], - ["cc.address.host", "address"], + ["cc.address.host", "127.0.0.1"], ["cc.tls_version", "TLSv1.2"], ["cc.sni", "address"], ["cc.ssl_established", "false"], diff --git a/test/mitmproxy/addons/test_dumper.py b/test/mitmproxy/addons/test_dumper.py index d8aa593b..fb80f3ce 100644 --- a/test/mitmproxy/addons/test_dumper.py +++ b/test/mitmproxy/addons/test_dumper.py @@ -148,7 +148,7 @@ class TestContentView: sio = io.StringIO() d = dumper.Dumper(sio) with taddons.context(options=options.Options()) as ctx: - ctx.configure(d, flow_detail=4, verbosity=3) + ctx.configure(d, flow_detail=4, verbosity='debug') d.response(tflow.tflow()) assert ctx.master.has_log("content viewer failed") diff --git a/test/mitmproxy/addons/test_termlog.py b/test/mitmproxy/addons/test_termlog.py index 2133b74d..027bdfeb 100644 --- a/test/mitmproxy/addons/test_termlog.py +++ b/test/mitmproxy/addons/test_termlog.py @@ -16,7 +16,7 @@ class TestTermLog: ]) def test_output(self, outfile, expected_out, expected_err, capfd): t = termlog.TermLog(outfile=outfile) - with taddons.context(options=Options(verbosity=2)) as tctx: + with taddons.context(options=Options(verbosity='info')) as tctx: tctx.configure(t) t.log(log.LogEntry("one", "info")) t.log(log.LogEntry("two", "debug")) diff --git a/test/mitmproxy/test_connections.py b/test/mitmproxy/test_connections.py index 99367bb6..83f0bd34 100644 --- a/test/mitmproxy/test_connections.py +++ b/test/mitmproxy/test_connections.py @@ -29,7 +29,7 @@ class TestClientConnection: def test_repr(self): c = tflow.tclient_conn() - assert 'address:22' in repr(c) + assert '127.0.0.1:22' in repr(c) assert 'ALPN' in repr(c) assert 'TLS' not in repr(c) diff --git a/test/mitmproxy/test_flowfilter.py b/test/mitmproxy/test_flowfilter.py index fe9b2408..c411258a 100644 --- a/test/mitmproxy/test_flowfilter.py +++ b/test/mitmproxy/test_flowfilter.py @@ -225,11 +225,11 @@ class TestMatchingHTTPFlow: def test_src(self): q = self.req() - assert self.q("~src address", q) + assert self.q("~src 127.0.0.1", q) assert not self.q("~src foobar", q) assert self.q("~src :22", q) assert not self.q("~src :99", q) - assert self.q("~src address:22", q) + assert self.q("~src 127.0.0.1:22", q) q.client_conn.address = None assert not self.q('~src address:22', q) @@ -315,11 +315,11 @@ class TestMatchingTCPFlow: def test_src(self): f = self.flow() - assert self.q("~src address", f) + assert self.q("~src 127.0.0.1", f) assert not self.q("~src foobar", f) assert self.q("~src :22", f) assert not self.q("~src :99", f) - assert self.q("~src address:22", f) + assert self.q("~src 127.0.0.1:22", f) def test_dst(self): f = self.flow() @@ -440,11 +440,11 @@ class TestMatchingWebSocketFlow: def test_src(self): f = self.flow() - assert self.q("~src address", f) + assert self.q("~src 127.0.0.1", f) assert not self.q("~src foobar", f) assert self.q("~src :22", f) assert not self.q("~src :99", f) - assert self.q("~src address:22", f) + assert self.q("~src 127.0.0.1:22", f) def test_dst(self): f = self.flow() @@ -524,7 +524,7 @@ class TestMatchingDummyFlow: assert not self.q("~s", f) - assert self.q("~src address", f) + assert self.q("~src 127.0.0.1", f) assert not self.q("~src nonexistent", f) assert not self.q("~tcp", f) diff --git a/test/mitmproxy/tools/console/test_master.py b/test/mitmproxy/tools/console/test_master.py index a3478bdc..ef357c76 100644 --- a/test/mitmproxy/tools/console/test_master.py +++ b/test/mitmproxy/tools/console/test_master.py @@ -28,7 +28,7 @@ def test_options(): class TestMaster(tservers.MasterTest): def mkmaster(self, **opts): if "verbosity" not in opts: - opts["verbosity"] = 1 + opts["verbosity"] = 'warn' o = options.Options(**opts) m = console.master.ConsoleMaster(o, proxy.DummyServer()) m.addons.trigger("configure", o.keys()) diff --git a/test/mitmproxy/tools/test_dump.py b/test/mitmproxy/tools/test_dump.py index 69a76d2e..597333af 100644 --- a/test/mitmproxy/tools/test_dump.py +++ b/test/mitmproxy/tools/test_dump.py @@ -12,7 +12,7 @@ from .. import tservers class TestDumpMaster(tservers.MasterTest): def mkmaster(self, flt, **opts): - o = options.Options(view_filter=flt, verbosity=-1, flow_detail=0, **opts) + o = options.Options(view_filter=flt, verbosity='error', flow_detail=0, **opts) m = dump.DumpMaster(o, proxy.DummyServer(), with_termlog=False, with_dumper=False) return m diff --git a/test/mitmproxy/tservers.py b/test/mitmproxy/tservers.py index 3a2050e1..9faaf20e 100644 --- a/test/mitmproxy/tservers.py +++ b/test/mitmproxy/tservers.py @@ -2,6 +2,7 @@ import os.path import threading import tempfile import sys +from unittest import mock import mitmproxy.platform from mitmproxy.proxy.config import ProxyConfig @@ -23,10 +24,13 @@ class MasterTest: def cycle(self, master, content): f = tflow.tflow(req=tutils.treq(content=content)) - master.addons.handle_lifecycle("clientconnect", f.client_conn) + layer = mock.Mock("mitmproxy.proxy.protocol.base.Layer") + layer.client_conn = f.client_conn + layer.reply = controller.DummyReply() + master.addons.handle_lifecycle("clientconnect", layer) for i in eventsequence.iterate(f): master.addons.handle_lifecycle(*i) - master.addons.handle_lifecycle("clientdisconnect", f.client_conn) + master.addons.handle_lifecycle("clientdisconnect", layer) return f def dummy_cycle(self, master, n, content): |