diff options
author | Aldo Cortesi <aldo@corte.si> | 2016-10-16 20:50:09 +1300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-16 20:50:09 +1300 |
commit | e4a32d6844963c09a8d4488f46277e2dcbeda3ab (patch) | |
tree | b1553be2db96b8717554db9c8449bada4c8648f7 /test | |
parent | 26af9b29fc3fed60a003d097b3470e85115b2161 (diff) | |
parent | 00603021d9d486e3e16511eee273d26f59a3ab10 (diff) | |
download | mitmproxy-e4a32d6844963c09a8d4488f46277e2dcbeda3ab.tar.gz mitmproxy-e4a32d6844963c09a8d4488f46277e2dcbeda3ab.tar.bz2 mitmproxy-e4a32d6844963c09a8d4488f46277e2dcbeda3ab.zip |
Merge pull request #1602 from cortesi/scriptdocs
docs: stub out new script documentation
Diffstat (limited to 'test')
-rw-r--r-- | test/mitmproxy/builtins/test_script.py | 8 | ||||
-rw-r--r-- | test/mitmproxy/test_addons.py | 2 | ||||
-rw-r--r-- | test/mitmproxy/test_examples.py | 7 |
3 files changed, 5 insertions, 12 deletions
diff --git a/test/mitmproxy/builtins/test_script.py b/test/mitmproxy/builtins/test_script.py index 261adb65..54451313 100644 --- a/test/mitmproxy/builtins/test_script.py +++ b/test/mitmproxy/builtins/test_script.py @@ -237,12 +237,8 @@ class TestScriptLoader(mastertest.MasterTest): "%s %s" % (rec, "b"), ] debug = [(i[0], i[1]) for i in m.event_log if i[0] == "debug"] - assert debug == [ - ('debug', 'c configure'), - ('debug', 'a configure'), - ('debug', 'b configure'), - ] - m.event_log[:] = [] + # No events, only order has changed + assert debug == [] o.scripts = [ "%s %s" % (rec, "x"), diff --git a/test/mitmproxy/test_addons.py b/test/mitmproxy/test_addons.py index 52d7f07f..c5d54e8c 100644 --- a/test/mitmproxy/test_addons.py +++ b/test/mitmproxy/test_addons.py @@ -16,6 +16,6 @@ def test_simple(): o = options.Options() m = controller.Master(o) a = addons.Addons(m) - a.add(o, TAddon("one")) + a.add(TAddon("one")) assert a.get("one") assert not a.get("two") diff --git a/test/mitmproxy/test_examples.py b/test/mitmproxy/test_examples.py index 1ba7ba7a..483cb228 100644 --- a/test/mitmproxy/test_examples.py +++ b/test/mitmproxy/test_examples.py @@ -87,11 +87,8 @@ class TestScripts(mastertest.MasterTest): m.request(f) assert f.request.query["mitmproxy"] == "rocks" - def test_modify_response_body(self): - with tutils.raises(ScriptError): - tscript("modify_response_body.py") - - m, sc = tscript("modify_response_body.py", "mitmproxy rocks") + def test_arguments(self): + m, sc = tscript("arguments.py", "mitmproxy rocks") f = tutils.tflow(resp=netutils.tresp(content=b"I <3 mitmproxy")) m.response(f) assert f.response.content == b"I <3 rocks" |