aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2016-07-15 13:22:20 +1200
committerAldo Cortesi <aldo@nullcube.com>2016-07-15 14:52:34 +1200
commit4ba7ce50c6aa7b96325e201f65747a3a6ace1a7a (patch)
tree462636079d7c0d7529242ac5fce71ef799ca9131 /test
parentfcc1416ffd82a3497bf17323b4bb467e7e4435f4 (diff)
downloadmitmproxy-4ba7ce50c6aa7b96325e201f65747a3a6ace1a7a.tar.gz
mitmproxy-4ba7ce50c6aa7b96325e201f65747a3a6ace1a7a.tar.bz2
mitmproxy-4ba7ce50c6aa7b96325e201f65747a3a6ace1a7a.zip
Add .start for addons and scripts
Also improve error messages, fix various unit tests
Diffstat (limited to 'test')
-rw-r--r--test/mitmproxy/builtins/test_script.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/test/mitmproxy/builtins/test_script.py b/test/mitmproxy/builtins/test_script.py
index 5747912d..2c2568ed 100644
--- a/test/mitmproxy/builtins/test_script.py
+++ b/test/mitmproxy/builtins/test_script.py
@@ -57,7 +57,10 @@ class TestScript(mastertest.MasterTest):
)
)
m.addons.add(sc)
- assert sc.ns["call_log"] == [("configure", (options.Options(),), {})]
+ assert sc.ns["call_log"] == [
+ ("start", (), {}),
+ ("configure", (options.Options(),), {})
+ ]
sc.ns["call_log"] = []
f = tutils.tflow(resp=True)
@@ -93,7 +96,7 @@ class TestScript(mastertest.MasterTest):
m.addons.add(sc)
f = tutils.tflow(resp=True)
self.invoke(m, "request", f)
- assert m.event_log[0][0] == "warn"
+ assert m.event_log[0][0] == "error"
def test_duplicate_flow(self):
s = state.State()