diff options
| author | Jim Shaver <dcypherd@gmail.com> | 2015-06-23 21:48:05 -0500 |
|---|---|---|
| committer | Jim Shaver <dcypherd@gmail.com> | 2015-06-23 21:48:05 -0500 |
| commit | 080e4534253338c94e6d8c86cb3679ff15410f85 (patch) | |
| tree | 6322fb822332b4135f0ff14de8c2d7137016f734 /test/scripts | |
| parent | db5c0b210b0133d7cd58124c727dbc24480e2568 (diff) | |
| parent | 074d8d7c7463cdb1f0a90e165a4b3ada3554b4c2 (diff) | |
| download | mitmproxy-080e4534253338c94e6d8c86cb3679ff15410f85.tar.gz mitmproxy-080e4534253338c94e6d8c86cb3679ff15410f85.tar.bz2 mitmproxy-080e4534253338c94e6d8c86cb3679ff15410f85.zip | |
Merge branch 'master' into hardfailvenv
Conflicts:
dev
Diffstat (limited to 'test/scripts')
| -rw-r--r-- | test/scripts/a.py | 4 | ||||
| -rw-r--r-- | test/scripts/all.py | 8 | ||||
| -rw-r--r-- | test/scripts/concurrent_decorator.py | 2 | ||||
| -rw-r--r-- | test/scripts/concurrent_decorator_err.py | 3 | ||||
| -rw-r--r-- | test/scripts/duplicate_flow.py | 1 | ||||
| -rw-r--r-- | test/scripts/stream_modify.py | 2 |
6 files changed, 16 insertions, 4 deletions
diff --git a/test/scripts/a.py b/test/scripts/a.py index 1d5717b0..210fea78 100644 --- a/test/scripts/a.py +++ b/test/scripts/a.py @@ -4,14 +4,18 @@ parser = argparse.ArgumentParser() parser.add_argument('--var', type=int) var = 0 + + def start(ctx, argv): global var var = parser.parse_args(argv[1:]).var + def here(ctx): global var var += 1 return var + def errargs(): pass diff --git a/test/scripts/all.py b/test/scripts/all.py index 3acaf694..dad2aade 100644 --- a/test/scripts/all.py +++ b/test/scripts/all.py @@ -1,28 +1,36 @@ log = [] + + def clientconnect(ctx, cc): ctx.log("XCLIENTCONNECT") log.append("clientconnect") + def serverconnect(ctx, cc): ctx.log("XSERVERCONNECT") log.append("serverconnect") + def request(ctx, f): ctx.log("XREQUEST") log.append("request") + def response(ctx, f): ctx.log("XRESPONSE") log.append("response") + def responseheaders(ctx, f): ctx.log("XRESPONSEHEADERS") log.append("responseheaders") + def clientdisconnect(ctx, cc): ctx.log("XCLIENTDISCONNECT") log.append("clientdisconnect") + def error(ctx, cc): ctx.log("XERROR") log.append("error") diff --git a/test/scripts/concurrent_decorator.py b/test/scripts/concurrent_decorator.py index 8e132006..f6feda1d 100644 --- a/test/scripts/concurrent_decorator.py +++ b/test/scripts/concurrent_decorator.py @@ -29,4 +29,4 @@ def error(context, err): @concurrent def clientdisconnect(context, dc): - context.log("clientdisconnect")
\ No newline at end of file + context.log("clientdisconnect") diff --git a/test/scripts/concurrent_decorator_err.py b/test/scripts/concurrent_decorator_err.py index 78191315..00fd8dad 100644 --- a/test/scripts/concurrent_decorator_err.py +++ b/test/scripts/concurrent_decorator_err.py @@ -1,5 +1,6 @@ from libmproxy.script import concurrent + @concurrent def start(context, argv): - pass
\ No newline at end of file + pass diff --git a/test/scripts/duplicate_flow.py b/test/scripts/duplicate_flow.py index f1b92309..e13af786 100644 --- a/test/scripts/duplicate_flow.py +++ b/test/scripts/duplicate_flow.py @@ -2,4 +2,3 @@ def request(ctx, f): f = ctx.duplicate_flow(f) ctx.replay_request(f) - diff --git a/test/scripts/stream_modify.py b/test/scripts/stream_modify.py index 9a98a7ee..e5c323be 100644 --- a/test/scripts/stream_modify.py +++ b/test/scripts/stream_modify.py @@ -4,4 +4,4 @@ def modify(chunks): def responseheaders(context, flow): - flow.response.stream = modify
\ No newline at end of file + flow.response.stream = modify |