diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-09-16 20:24:48 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-09-16 20:24:48 +0200 |
| commit | 8fbed971ae4a84e875f1072805b17cc7ada39fad (patch) | |
| tree | 09c31384b2b1d22680534af8ff40ae724a13e05b /test/test_flow.py | |
| parent | ee6969c1fac20d592e0775bfe074b4bcfcf83461 (diff) | |
| parent | 0af060897854e0e0fc8207af02d22bec9eacab12 (diff) | |
| download | mitmproxy-8fbed971ae4a84e875f1072805b17cc7ada39fad.tar.gz mitmproxy-8fbed971ae4a84e875f1072805b17cc7ada39fad.tar.bz2 mitmproxy-8fbed971ae4a84e875f1072805b17cc7ada39fad.zip | |
Merge pull request #768 from mitmproxy/netlib-http1-refactor
Adjust to netlib changes
Diffstat (limited to 'test/test_flow.py')
| -rw-r--r-- | test/test_flow.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/test_flow.py b/test/test_flow.py index c93beca4..f73187c1 100644 --- a/test/test_flow.py +++ b/test/test_flow.py @@ -8,7 +8,7 @@ import mock import netlib.utils from netlib import odict -from netlib.http.semantics import CONTENT_MISSING, HDR_FORM_URLENCODED, Headers +from netlib.http import CONTENT_MISSING, HDR_FORM_URLENCODED, Headers from libmproxy import filt, protocol, controller, tnetstring, flow from libmproxy.models import Error, Flow, HTTPRequest, HTTPResponse, HTTPFlow, decoded from libmproxy.proxy.config import HostMatcher @@ -849,7 +849,7 @@ class TestFlowMaster: s = flow.State() f = tutils.tflow() - f.response = HTTPResponse.wrap(netlib.tutils.tresp(f.request)) + f.response = HTTPResponse.wrap(netlib.tutils.tresp(body=f.request)) pb = [f] fm = flow.FlowMaster(None, s) @@ -903,7 +903,7 @@ class TestFlowMaster: def test_server_playback_kill(self): s = flow.State() f = tutils.tflow() - f.response = HTTPResponse.wrap(netlib.tutils.tresp(f.request)) + f.response = HTTPResponse.wrap(netlib.tutils.tresp(body=f.request)) pb = [f] fm = flow.FlowMaster(None, s) fm.refresh_server_playback = True @@ -1043,7 +1043,7 @@ class TestRequest: def test_getset_form_urlencoded(self): d = odict.ODict([("one", "two"), ("three", "four")]) - r = HTTPRequest.wrap(netlib.tutils.treq(content=netlib.utils.urlencode(d.lst))) + r = HTTPRequest.wrap(netlib.tutils.treq(body=netlib.utils.urlencode(d.lst))) r.headers["content-type"] = HDR_FORM_URLENCODED assert r.get_form_urlencoded() == d |