diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/mitmproxy/builtins/test_termlog.py | 17 | ||||
| -rw-r--r-- | test/mitmproxy/data/addonscripts/recorder.py | 4 | ||||
| -rw-r--r-- | test/mitmproxy/data/scripts/all.py | 16 | ||||
| -rw-r--r-- | test/mitmproxy/mastertest.py | 5 | ||||
| -rw-r--r-- | test/mitmproxy/tservers.py | 5 |
5 files changed, 31 insertions, 16 deletions
diff --git a/test/mitmproxy/builtins/test_termlog.py b/test/mitmproxy/builtins/test_termlog.py new file mode 100644 index 00000000..a1510442 --- /dev/null +++ b/test/mitmproxy/builtins/test_termlog.py @@ -0,0 +1,17 @@ +from .. import mastertest +from six.moves import cStringIO as StringIO + +from mitmproxy.builtins import termlog +from mitmproxy import controller +from mitmproxy import dump + + +class TestTermLog(mastertest.MasterTest): + def test_simple(self): + t = termlog.TermLog() + sio = StringIO() + t.configure(dump.Options(tfile = sio, verbosity = 2), set([])) + t.log(controller.LogEntry("one", "info")) + assert "one" in sio.getvalue() + t.log(controller.LogEntry("two", "debug")) + assert "two" not in sio.getvalue() diff --git a/test/mitmproxy/data/addonscripts/recorder.py b/test/mitmproxy/data/addonscripts/recorder.py index 890e6f4e..3d7a51bf 100644 --- a/test/mitmproxy/data/addonscripts/recorder.py +++ b/test/mitmproxy/data/addonscripts/recorder.py @@ -15,8 +15,8 @@ class CallLogger: lg = (self.name, attr, args, kwargs) if attr != "log": ctx.log.info(str(lg)) - self.call_log.append(lg) - ctx.log.debug("%s %s" % (self.name, attr)) + self.call_log.append(lg) + ctx.log.debug("%s %s" % (self.name, attr)) return prox raise AttributeError diff --git a/test/mitmproxy/data/scripts/all.py b/test/mitmproxy/data/scripts/all.py index bf8e93ec..95edfe97 100644 --- a/test/mitmproxy/data/scripts/all.py +++ b/test/mitmproxy/data/scripts/all.py @@ -1,37 +1,37 @@ import mitmproxy -log = [] +record = [] def clientconnect(cc): mitmproxy.ctx.log("XCLIENTCONNECT") - log.append("clientconnect") + record.append("clientconnect") def serverconnect(cc): mitmproxy.ctx.log("XSERVERCONNECT") - log.append("serverconnect") + record.append("serverconnect") def request(f): mitmproxy.ctx.log("XREQUEST") - log.append("request") + record.append("request") def response(f): mitmproxy.ctx.log("XRESPONSE") - log.append("response") + record.append("response") def responseheaders(f): mitmproxy.ctx.log("XRESPONSEHEADERS") - log.append("responseheaders") + record.append("responseheaders") def clientdisconnect(cc): mitmproxy.ctx.log("XCLIENTDISCONNECT") - log.append("clientdisconnect") + record.append("clientdisconnect") def error(cc): mitmproxy.ctx.log("XERROR") - log.append("error") + record.append("error") diff --git a/test/mitmproxy/mastertest.py b/test/mitmproxy/mastertest.py index a14fe02a..5605b1a6 100644 --- a/test/mitmproxy/mastertest.py +++ b/test/mitmproxy/mastertest.py @@ -4,7 +4,7 @@ from . import tutils import netlib.tutils from mitmproxy.flow import master -from mitmproxy import flow, proxy, models, controller, options +from mitmproxy import flow, proxy, models, options class TestMaster: @@ -15,9 +15,6 @@ class MasterTest: def cycle(self, master, content): f = tutils.tflow(req=netlib.tutils.treq(content=content)) - l = proxy.Log("connect") - l.reply = controller.DummyReply() - master.log(l) master.clientconnect(f.client_conn) master.serverconnect(f.server_conn) master.request(f) diff --git a/test/mitmproxy/tservers.py b/test/mitmproxy/tservers.py index 119c2cae..d3806a99 100644 --- a/test/mitmproxy/tservers.py +++ b/test/mitmproxy/tservers.py @@ -44,8 +44,9 @@ class TestMaster(flow.FlowMaster): def clear_log(self): self.tlog = [] - def add_log(self, message, level=None): - self.tlog.append(message) + @controller.handler + def log(self, e): + self.tlog.append(e.msg) class ProxyThread(threading.Thread): |