diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2016-07-14 17:19:33 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2016-07-14 19:54:15 +1200 |
| commit | deffed2196a8d595624998b9fcc8fa4016b41808 (patch) | |
| tree | 0aa8ef89dda9b42fed8c87843e9b284395e37c9b /test | |
| parent | b94f5fd361af6255ad4d3c7a88b9a21868736dea (diff) | |
| download | mitmproxy-deffed2196a8d595624998b9fcc8fa4016b41808.tar.gz mitmproxy-deffed2196a8d595624998b9fcc8fa4016b41808.tar.bz2 mitmproxy-deffed2196a8d595624998b9fcc8fa4016b41808.zip | |
Script cleanup: editing in console, Python3 compatibility fixes
Diffstat (limited to 'test')
| -rw-r--r-- | test/mitmproxy/script/test_concurrent.py | 3 | ||||
| -rw-r--r-- | test/mitmproxy/test_examples.py | 24 | ||||
| -rw-r--r-- | test/mitmproxy/test_server.py | 4 |
3 files changed, 18 insertions, 13 deletions
diff --git a/test/mitmproxy/script/test_concurrent.py b/test/mitmproxy/script/test_concurrent.py index d5243bcb..92d1153b 100644 --- a/test/mitmproxy/script/test_concurrent.py +++ b/test/mitmproxy/script/test_concurrent.py @@ -1,11 +1,10 @@ -from test.mitmproxy import tutils +from test.mitmproxy import tutils, mastertest from mitmproxy import controller from mitmproxy.builtins import script from mitmproxy import options from mitmproxy.flow import master from mitmproxy.flow import state import time -from .. import mastertest, tutils class Thing: diff --git a/test/mitmproxy/test_examples.py b/test/mitmproxy/test_examples.py index 9c8edb29..ef97219c 100644 --- a/test/mitmproxy/test_examples.py +++ b/test/mitmproxy/test_examples.py @@ -1,5 +1,6 @@ import json +import sys import os.path from mitmproxy.flow import master from mitmproxy.flow import state @@ -42,19 +43,19 @@ class TestScripts(mastertest.MasterTest): def test_custom_contentviews(self): m, sc = tscript("custom_contentviews.py") pig = contentviews.get("pig_latin_HTML") - _, fmt = pig("<html>test!</html>") - assert any('esttay!' in val[0][1] for val in fmt) - assert not pig("gobbledygook") + _, fmt = pig(b"<html>test!</html>") + assert any(b'esttay!' in val[0][1] for val in fmt) + assert not pig(b"gobbledygook") def test_iframe_injector(self): with tutils.raises(ScriptError): tscript("iframe_injector.py") m, sc = tscript("iframe_injector.py", "http://example.org/evil_iframe") - flow = tutils.tflow(resp=netutils.tresp(content="<html>mitmproxy</html>")) + flow = tutils.tflow(resp=netutils.tresp(content=b"<html>mitmproxy</html>")) self.invoke(m, "response", flow) content = flow.response.content - assert 'iframe' in content and 'evil_iframe' in content + assert b'iframe' in content and b'evil_iframe' in content def test_modify_form(self): m, sc = tscript("modify_form.py") @@ -63,11 +64,11 @@ class TestScripts(mastertest.MasterTest): f = tutils.tflow(req=netutils.treq(headers=form_header)) self.invoke(m, "request", f) - assert f.request.urlencoded_form["mitmproxy"] == "rocks" + assert f.request.urlencoded_form[b"mitmproxy"] == b"rocks" f.request.headers["content-type"] = "" self.invoke(m, "request", f) - assert list(f.request.urlencoded_form.items()) == [("foo", "bar")] + assert list(f.request.urlencoded_form.items()) == [(b"foo", b"bar")] def test_modify_querystring(self): m, sc = tscript("modify_querystring.py") @@ -85,9 +86,9 @@ class TestScripts(mastertest.MasterTest): tscript("modify_response_body.py") m, sc = tscript("modify_response_body.py", "mitmproxy rocks") - f = tutils.tflow(resp=netutils.tresp(content="I <3 mitmproxy")) + f = tutils.tflow(resp=netutils.tresp(content=b"I <3 mitmproxy")) self.invoke(m, "response", f) - assert f.response.content == "I <3 rocks" + assert f.response.content == b"I <3 rocks" def test_redirect_requests(self): m, sc = tscript("redirect_requests.py") @@ -96,6 +97,11 @@ class TestScripts(mastertest.MasterTest): assert f.request.host == "mitmproxy.org" def test_har_extractor(self): + if sys.version_info >= (3, 0): + with tutils.raises("does not work on Python 3"): + tscript("har_extractor.py") + return + with tutils.raises(ScriptError): tscript("har_extractor.py") diff --git a/test/mitmproxy/test_server.py b/test/mitmproxy/test_server.py index b1ca6910..a5196dae 100644 --- a/test/mitmproxy/test_server.py +++ b/test/mitmproxy/test_server.py @@ -293,7 +293,7 @@ class TestHTTP(tservers.HTTPProxyTest, CommonMixin, AppMixin): ) self.master.addons.add(s) d = self.pathod('200:b"foo"') - assert d.content == "bar" + assert d.content == b"bar" self.master.addons.remove(s) @@ -523,7 +523,7 @@ class TestTransparent(tservers.TransparentProxyTest, CommonMixin, TcpMixin): self._tcpproxy_on() d = self.pathod('200:b"foo"') self._tcpproxy_off() - assert d.content == "bar" + assert d.content == b"bar" self.master.addons.remove(s) |