diff options
Diffstat (limited to 'test/mitmproxy/builtins/test_script.py')
-rw-r--r-- | test/mitmproxy/builtins/test_script.py | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/test/mitmproxy/builtins/test_script.py b/test/mitmproxy/builtins/test_script.py index 24337760..f92765ee 100644 --- a/test/mitmproxy/builtins/test_script.py +++ b/test/mitmproxy/builtins/test_script.py @@ -63,7 +63,7 @@ class TestScript(mastertest.MasterTest): "data/addonscripts/recorder.py" ) ) - m.addons.add(o, sc) + m.addons.add(sc) assert sc.ns.call_log == [ ("solo", "start", (), {}), ("solo", "configure", (o, o.keys()), {}) @@ -84,7 +84,7 @@ class TestScript(mastertest.MasterTest): with open("foo.py", "w"): pass sc = script.Script("foo.py") - m.addons.add(o, sc) + m.addons.add(sc) for _ in range(100): with open("foo.py", "a") as f: @@ -102,7 +102,7 @@ class TestScript(mastertest.MasterTest): sc = script.Script( tutils.test_data.path("data/addonscripts/error.py") ) - m.addons.add(o, sc) + m.addons.add(sc) f = tutils.tflow(resp=True) m.request(f) assert m.event_log[0][0] == "error" @@ -116,7 +116,6 @@ class TestScript(mastertest.MasterTest): o = options.Options() fm = master.FlowMaster(o, None, s) fm.addons.add( - o, script.Script( tutils.test_data.path("data/addonscripts/duplicate_flow.py") ) @@ -136,7 +135,7 @@ class TestScript(mastertest.MasterTest): "data/addonscripts/addon.py" ) ) - m.addons.add(o, sc) + m.addons.add(sc) assert sc.ns.event_log == [ 'scriptstart', 'addonstart', 'addonconfigure' ] @@ -166,7 +165,7 @@ class TestScriptLoader(mastertest.MasterTest): o = options.Options(scripts=[]) m = master.FlowMaster(o, None, s) sl = script.ScriptLoader() - m.addons.add(o, sl) + m.addons.add(sl) f = tutils.tflow(resp=True) with m.handlecontext(): @@ -191,7 +190,7 @@ class TestScriptLoader(mastertest.MasterTest): o = options.Options(scripts=[]) m = master.FlowMaster(o, None, s) sc = script.ScriptLoader() - m.addons.add(o, sc) + m.addons.add(sc) assert len(m.addons) == 1 o.update( scripts = [ @@ -222,7 +221,7 @@ class TestScriptLoader(mastertest.MasterTest): ) m = mastertest.RecordingMaster(o, None, s) sc = script.ScriptLoader() - m.addons.add(o, sc) + m.addons.add(sc) debug = [(i[0], i[1]) for i in m.event_log if i[0] == "debug"] assert debug == [ |