aboutsummaryrefslogtreecommitdiffstats
path: root/test/test_dump.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2015-09-28 13:54:53 +0200
committerMaximilian Hils <git@maximilianhils.com>2015-09-28 13:54:53 +0200
commitc11ab3676dee2a490994665e867bcfcb26945777 (patch)
treef898c23973b10079fa4479238d5f8f5a8e61d46e /test/test_dump.py
parent6661770d4eee3eab3305793613586f3684c24ae9 (diff)
parent6075957a9730c6ca5c4c7361bd774345f83d6f59 (diff)
downloadmitmproxy-c11ab3676dee2a490994665e867bcfcb26945777.tar.gz
mitmproxy-c11ab3676dee2a490994665e867bcfcb26945777.tar.bz2
mitmproxy-c11ab3676dee2a490994665e867bcfcb26945777.zip
Merge branch 'http-models'
Diffstat (limited to 'test/test_dump.py')
-rw-r--r--test/test_dump.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/test/test_dump.py b/test/test_dump.py
index 56d3edd2..a903a651 100644
--- a/test/test_dump.py
+++ b/test/test_dump.py
@@ -38,13 +38,13 @@ def test_strfuncs():
flow.request.stickycookie = True
flow.client_conn = mock.MagicMock()
flow.client_conn.address.host = "foo"
- flow.response = netlib.tutils.tresp(body=CONTENT_MISSING)
+ flow.response = netlib.tutils.tresp(content=CONTENT_MISSING)
flow.response.is_replay = True
flow.response.status_code = 300
m.echo_flow(flow)
- flow = tutils.tflow(resp=netlib.tutils.tresp(body="{"))
+ flow = tutils.tflow(resp=netlib.tutils.tresp(content="{"))
flow.response.headers["content-type"] = "application/json"
flow.response.status_code = 400
m.echo_flow(flow)
@@ -62,14 +62,14 @@ def test_contentview(get_content_view):
class TestDumpMaster:
def _cycle(self, m, content):
- f = tutils.tflow(req=netlib.tutils.treq(body=content))
+ f = tutils.tflow(req=netlib.tutils.treq(content=content))
l = Log("connect")
l.reply = mock.MagicMock()
m.handle_log(l)
m.handle_clientconnect(f.client_conn)
m.handle_serverconnect(f.server_conn)
m.handle_request(f)
- f.response = HTTPResponse.wrap(netlib.tutils.tresp(body=content))
+ f.response = HTTPResponse.wrap(netlib.tutils.tresp(content=content))
f = m.handle_response(f)
m.handle_clientdisconnect(f.client_conn)
return f