aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2012-06-10 16:49:59 +1200
committerAldo Cortesi <aldo@nullcube.com>2012-06-10 16:49:59 +1200
commitd60fa9918bf9a074c420a4fb3b8fa26b86710d9b (patch)
treecc1b8d088b575ade659f58cb04bfb9c8a8e463ad /test
parent1f659948cddab77d9203d4d3b979b10d8fa12b98 (diff)
downloadmitmproxy-d60fa9918bf9a074c420a4fb3b8fa26b86710d9b.tar.gz
mitmproxy-d60fa9918bf9a074c420a4fb3b8fa26b86710d9b.tar.bz2
mitmproxy-d60fa9918bf9a074c420a4fb3b8fa26b86710d9b.zip
Localise client connection object manipulation.
This simplifies the call signature for a bunch of functions.
Diffstat (limited to 'test')
-rw-r--r--test/test_proxy.py28
1 files changed, 16 insertions, 12 deletions
diff --git a/test/test_proxy.py b/test/test_proxy.py
index 9fd03008..9d7239dd 100644
--- a/test/test_proxy.py
+++ b/test/test_proxy.py
@@ -4,7 +4,12 @@ import libpry
from libmproxy import proxy, flow
import tutils
-class Dummy: pass
+
+def test_has_chunked_encoding():
+ h = flow.ODictCaseless()
+ assert not proxy.has_chunked_encoding(h)
+ h["transfer-encoding"] = ["chunked"]
+ assert proxy.has_chunked_encoding(h)
def test_read_chunked():
@@ -24,36 +29,35 @@ def test_read_chunked():
tutils.raises(proxy.ProxyError, proxy.read_chunked, s, None)
-def test_should_connection_close():
+def test_request_connection_close():
h = flow.ODictCaseless()
- assert proxy.should_connection_close((1, 0), h)
- assert not proxy.should_connection_close((1, 1), h)
+ assert proxy.request_connection_close((1, 0), h)
+ assert not proxy.request_connection_close((1, 1), h)
h["connection"] = ["keep-alive"]
- assert not proxy.should_connection_close((1, 1), h)
+ assert not proxy.request_connection_close((1, 1), h)
def test_read_http_body():
- d = Dummy()
h = flow.ODict()
s = cStringIO.StringIO("testing")
- assert proxy.read_http_body(s, d, h, False, None) == ""
+ assert proxy.read_http_body(s, h, False, None) == ""
h["content-length"] = ["foo"]
s = cStringIO.StringIO("testing")
- tutils.raises(proxy.ProxyError, proxy.read_http_body, s, d, h, False, None)
+ tutils.raises(proxy.ProxyError, proxy.read_http_body, s, h, False, None)
h["content-length"] = [5]
s = cStringIO.StringIO("testing")
- assert len(proxy.read_http_body(s, d, h, False, None)) == 5
+ assert len(proxy.read_http_body(s, h, False, None)) == 5
s = cStringIO.StringIO("testing")
- tutils.raises(proxy.ProxyError, proxy.read_http_body, s, d, h, False, 4)
+ tutils.raises(proxy.ProxyError, proxy.read_http_body, s, h, False, 4)
h = flow.ODict()
s = cStringIO.StringIO("testing")
- assert len(proxy.read_http_body(s, d, h, True, 4)) == 4
+ assert len(proxy.read_http_body(s, h, True, 4)) == 4
s = cStringIO.StringIO("testing")
- assert len(proxy.read_http_body(s, d, h, True, 100)) == 7
+ assert len(proxy.read_http_body(s, h, True, 100)) == 7
class TestFileLike: