aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorJessica Favin <j.favin@hotmail.fr>2018-11-04 17:24:34 +0100
committerJessica Favin <j.favin@hotmail.fr>2018-11-04 17:24:34 +0100
commit0cbbcffd89c84c00d1fbd989778a34c42f914779 (patch)
treea153373ea8fbab7b6cbe198c76f2169eab701efb /test
parent312f9223163002d95ce4a27fa26c394df4eea9d2 (diff)
downloadmitmproxy-0cbbcffd89c84c00d1fbd989778a34c42f914779.tar.gz
mitmproxy-0cbbcffd89c84c00d1fbd989778a34c42f914779.tar.bz2
mitmproxy-0cbbcffd89c84c00d1fbd989778a34c42f914779.zip
test_dumper.py - Add sio_err everywhere + adjust test_simple
Diffstat (limited to 'test')
-rw-r--r--test/mitmproxy/addons/test_dumper.py30
1 files changed, 26 insertions, 4 deletions
diff --git a/test/mitmproxy/addons/test_dumper.py b/test/mitmproxy/addons/test_dumper.py
index b1dc20b8..7a41c7b9 100644
--- a/test/mitmproxy/addons/test_dumper.py
+++ b/test/mitmproxy/addons/test_dumper.py
@@ -32,37 +32,50 @@ def test_configure():
def test_simple():
sio = io.StringIO()
- d = dumper.Dumper(sio)
+ sio_err = io.StringIO()
+ d = dumper.Dumper(sio, sio_err)
with taddons.context(d) as ctx:
ctx.configure(d, flow_detail=0)
d.response(tflow.tflow(resp=True))
assert not sio.getvalue()
sio.truncate(0)
+ assert not sio_err.getvalue()
+ sio_err.truncate(0)
ctx.configure(d, flow_detail=1)
d.response(tflow.tflow(resp=True))
assert sio.getvalue()
sio.truncate(0)
+ assert not sio_err.getvalue()
+ sio_err.truncate(0)
ctx.configure(d, flow_detail=1)
d.error(tflow.tflow(err=True))
assert sio.getvalue()
sio.truncate(0)
+ assert not sio_err.getvalue()
+ sio_err.truncate(0)
ctx.configure(d, flow_detail=4)
d.response(tflow.tflow(resp=True))
assert sio.getvalue()
sio.truncate(0)
+ assert not sio_err.getvalue()
+ sio_err.truncate(0)
ctx.configure(d, flow_detail=4)
d.response(tflow.tflow(resp=True))
assert "<<" in sio.getvalue()
sio.truncate(0)
+ assert not sio_err.getvalue()
+ sio_err.truncate(0)
ctx.configure(d, flow_detail=4)
d.response(tflow.tflow(err=True))
assert "<<" in sio.getvalue()
sio.truncate(0)
+ assert not sio_err.getvalue()
+ sio_err.truncate(0)
ctx.configure(d, flow_detail=4)
flow = tflow.tflow()
@@ -75,6 +88,8 @@ def test_simple():
d.response(flow)
assert sio.getvalue()
sio.truncate(0)
+ assert not sio_err.getvalue()
+ sio_err.truncate(0)
ctx.configure(d, flow_detail=4)
flow = tflow.tflow(resp=tutils.tresp(content=b"{"))
@@ -83,6 +98,8 @@ def test_simple():
d.response(flow)
assert sio.getvalue()
sio.truncate(0)
+ assert not sio_err.getvalue()
+ sio_err.truncate(0)
ctx.configure(d, flow_detail=4)
flow = tflow.tflow()
@@ -92,6 +109,8 @@ def test_simple():
d.response(flow)
assert "content missing" in sio.getvalue()
sio.truncate(0)
+ assert not sio_err.getvalue()
+ sio_err.truncate(0)
def test_echo_body():
@@ -100,7 +119,8 @@ def test_echo_body():
f.response.content = b"foo bar voing\n" * 100
sio = io.StringIO()
- d = dumper.Dumper(sio)
+ sio_err = io.StringIO()
+ d = dumper.Dumper(sio, sio_err)
with taddons.context(d) as ctx:
ctx.configure(d, flow_detail=3)
d._echo_message(f.response)
@@ -110,7 +130,8 @@ def test_echo_body():
def test_echo_request_line():
sio = io.StringIO()
- d = dumper.Dumper(sio)
+ sio_err = io.StringIO()
+ d = dumper.Dumper(sio, sio_err)
with taddons.context(d) as ctx:
ctx.configure(d, flow_detail=3, showhost=True)
f = tflow.tflow(client_conn=None, server_conn=True, resp=True)
@@ -146,7 +167,8 @@ class TestContentView:
with mock.patch("mitmproxy.contentviews.auto.ViewAuto.__call__") as va:
va.side_effect = exceptions.ContentViewException("")
sio = io.StringIO()
- d = dumper.Dumper(sio)
+ sio_err = io.StringIO()
+ d = dumper.Dumper(sio, sio_err)
with taddons.context(d) as ctx:
ctx.configure(d, flow_detail=4)
d.response(tflow.tflow())