aboutsummaryrefslogtreecommitdiffstats
path: root/test/scripts
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2013-06-16 00:41:43 +0200
committerMaximilian Hils <git@maximilianhils.com>2013-06-16 00:41:43 +0200
commitfd36142018a18f0d6c996e9c07bfc7e80e20afc4 (patch)
tree6a42399d1150a6196c71c7fb7bd80b0dc6fbf58b /test/scripts
parent34f286df511d0d6987a21e105a7cde651130fa2d (diff)
parentb4f6f09c83faf54c4c1493e18ba11d0257ca841b (diff)
downloadmitmproxy-fd36142018a18f0d6c996e9c07bfc7e80e20afc4.tar.gz
mitmproxy-fd36142018a18f0d6c996e9c07bfc7e80e20afc4.tar.bz2
mitmproxy-fd36142018a18f0d6c996e9c07bfc7e80e20afc4.zip
Merge remote-tracking branch 'origin/scripts_improvements' into 0.10
Diffstat (limited to 'test/scripts')
-rw-r--r--test/scripts/a.py8
-rw-r--r--test/scripts/starterr.py2
2 files changed, 9 insertions, 1 deletions
diff --git a/test/scripts/a.py b/test/scripts/a.py
index 0a21b619..1d5717b0 100644
--- a/test/scripts/a.py
+++ b/test/scripts/a.py
@@ -1,5 +1,13 @@
+import argparse
+
+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
diff --git a/test/scripts/starterr.py b/test/scripts/starterr.py
index 456fecc0..b217bdfe 100644
--- a/test/scripts/starterr.py
+++ b/test/scripts/starterr.py
@@ -1,3 +1,3 @@
-def start(ctx):
+def start(ctx, argv):
raise ValueError