diff options
author | Maximilian Hils <git@maximilianhils.com> | 2015-03-26 18:17:36 +0100 |
---|---|---|
committer | Maximilian Hils <git@maximilianhils.com> | 2015-03-26 18:17:36 +0100 |
commit | 04f2467e84905d44483469cf43ada4ec44faa203 (patch) | |
tree | 9076642f7439a877d1839293739b75d3c0f805c5 /test | |
parent | 9854379046a5464f4fd638785bafca87b91a495a (diff) | |
parent | 423530fc258ddd09642de401c4fd5cf71ed06be6 (diff) | |
download | mitmproxy-04f2467e84905d44483469cf43ada4ec44faa203.tar.gz mitmproxy-04f2467e84905d44483469cf43ada4ec44faa203.tar.bz2 mitmproxy-04f2467e84905d44483469cf43ada4ec44faa203.zip |
Merge branch 'master' of github.com:mitmproxy/mitmproxy
Diffstat (limited to 'test')
-rw-r--r-- | test/test_protocol_http.py | 21 | ||||
-rw-r--r-- | test/test_utils.py | 19 |
2 files changed, 39 insertions, 1 deletions
diff --git a/test/test_protocol_http.py b/test/test_protocol_http.py index 16870777..23c3f469 100644 --- a/test/test_protocol_http.py +++ b/test/test_protocol_http.py @@ -1,3 +1,4 @@ +from mock import MagicMock from libmproxy.protocol.http import * from cStringIO import StringIO import tutils, tservers @@ -112,6 +113,26 @@ class TestHTTPRequest: r = tutils.treq() assert repr(r) + def test_get_form_for_urlencoded(self): + r = tutils.treq() + r.headers.add("content-type", "application/x-www-form-urlencoded") + r.get_form_urlencoded = MagicMock() + + r.get_form() + + assert r.get_form_urlencoded.called + + def test_get_form_for_multipart(self): + r = tutils.treq() + r.headers.add("content-type", "multipart/form-data") + r.get_form_multipart = MagicMock() + + r.get_form() + + assert r.get_form_multipart.called + + + class TestHTTPResponse: def test_read_from_stringio(self): diff --git a/test/test_utils.py b/test/test_utils.py index 1678a7de..35ba0c9d 100644 --- a/test/test_utils.py +++ b/test/test_utils.py @@ -1,5 +1,5 @@ import json -from libmproxy import utils +from libmproxy import utils, flow import tutils utils.CERT_SLEEP_TIME = 0 @@ -52,6 +52,23 @@ def test_urldecode(): s = "one=two&three=four" assert len(utils.urldecode(s)) == 2 +def test_multipartdecode(): + boundary = 'somefancyboundary' + headers = flow.ODict([('content-type', ('multipart/form-data; boundary=%s' % boundary))]) + content = "--{0}\n" \ + "Content-Disposition: form-data; name=\"field1\"\n\n" \ + "value1\n" \ + "--{0}\n" \ + "Content-Disposition: form-data; name=\"field2\"\n\n" \ + "value2\n" \ + "--{0}--".format(boundary) + + form = utils.multipartdecode(headers, content) + + assert len(form) == 2 + assert form[0] == ('field1', 'value1') + assert form[1] == ('field2', 'value2') + def test_pretty_duration(): assert utils.pretty_duration(0.00001) == "0ms" assert utils.pretty_duration(0.0001) == "0ms" |