aboutsummaryrefslogtreecommitdiffstats
path: root/test/test_language.py
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2012-10-30 16:04:48 +1300
committerAldo Cortesi <aldo@nullcube.com>2012-10-30 16:08:36 +1300
commitf8df0a1e75422e5ffed1c7131d0c017afa227faa (patch)
treebcddeff4f1182864408db569f3e80ecfbc181d3a /test/test_language.py
parenta09584b9e65d42b4a0f63be7d4e55c113d5fbc89 (diff)
downloadmitmproxy-f8df0a1e75422e5ffed1c7131d0c017afa227faa.tar.gz
mitmproxy-f8df0a1e75422e5ffed1c7131d0c017afa227faa.tar.bz2
mitmproxy-f8df0a1e75422e5ffed1c7131d0c017afa227faa.zip
Add a .values method to messages, simplify a lot of stuff as a consequence.
Diffstat (limited to 'test/test_language.py')
-rw-r--r--test/test_language.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/test/test_language.py b/test/test_language.py
index 0711a02e..688dfc8c 100644
--- a/test/test_language.py
+++ b/test/test_language.py
@@ -260,7 +260,7 @@ class Test_Action:
def test_resolve(self):
r = language.parse_request({}, 'GET:"/foo"')
e = language.DisconnectAt("r")
- ret = e.resolve(r, {}, None)
+ ret = e.resolve(r, {})
assert isinstance(ret.offset, int)
def test_repr(self):
@@ -444,7 +444,7 @@ class TestParseResponse:
def test_parse_stress(self):
r = language.parse_response({}, "400:b@100g")
- assert r.length({}, None)
+ assert r.length({})
def test_spec(self):
def rt(s):
@@ -583,7 +583,7 @@ class TestResponse:
def testlen(x):
s = cStringIO.StringIO()
language.serve(x, s, {})
- assert x.length({}, None) == len(s.getvalue())
+ assert x.length({}) == len(s.getvalue())
testlen(language.parse_response({}, "400:m'msg':r"))
testlen(language.parse_response({}, "400:m'msg':h'foo'='bar':r"))
testlen(language.parse_response({}, "400:m'msg':h'foo'='bar':b@100b:r"))
@@ -591,7 +591,7 @@ class TestResponse:
def test_maximum_length(self):
def testlen(x):
s = cStringIO.StringIO()
- m = x.maximum_length({}, None)
+ m = x.maximum_length({})
language.serve(x, s, {})
assert m >= len(s.getvalue())