diff options
| author | Zohar Lorberbaum <zlorber@gmail.com> | 2016-03-28 10:03:26 -0700 |
|---|---|---|
| committer | Zohar Lorberbaum <zlorber@gmail.com> | 2016-03-28 10:03:26 -0700 |
| commit | 6d16f44ab723ef23a633b175c1cb4575919b07c4 (patch) | |
| tree | 2cf1d25543e4e81475aa97207d91a8629ce538dd /test/mitmproxy/test_flow.py | |
| parent | e56198ae7cf5de1d00c799133d3257434072998e (diff) | |
| download | mitmproxy-6d16f44ab723ef23a633b175c1cb4575919b07c4.tar.gz mitmproxy-6d16f44ab723ef23a633b175c1cb4575919b07c4.tar.bz2 mitmproxy-6d16f44ab723ef23a633b175c1cb4575919b07c4.zip | |
Merge with master
Diffstat (limited to 'test/mitmproxy/test_flow.py')
| -rw-r--r-- | test/mitmproxy/test_flow.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/mitmproxy/test_flow.py b/test/mitmproxy/test_flow.py index 33d2b8f9..2353935b 100644 --- a/test/mitmproxy/test_flow.py +++ b/test/mitmproxy/test_flow.py @@ -8,7 +8,7 @@ import mock import netlib.utils from netlib import odict -from netlib.http import CONTENT_MISSING, Headers +from netlib.http import Headers from mitmproxy import filt, controller, tnetstring, flow from mitmproxy.models import Error from mitmproxy.models import Flow @@ -465,7 +465,7 @@ class TestFlow(object): def test_replace_no_content(self): f = tutils.tflow() - f.request.content = CONTENT_MISSING + f.request.content = None assert f.replace("foo", "bar") == 0 def test_replace(self): @@ -751,7 +751,7 @@ class TestFlowMaster: s = flow.State() fm = flow.FlowMaster(None, s) f = tutils.tflow(resp=True) - f.request.content = CONTENT_MISSING + f.request.content = None assert "missing" in fm.replay_request(f) f.intercepted = True |