aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2017-08-21 18:49:51 +0200
committerMaximilian Hils <git@maximilianhils.com>2017-08-21 21:39:40 +0200
commitca3e98640c2344da356700635c8d84be1606b411 (patch)
treefea6be424a23b38715cfe63bef9f8b8e846aa168 /test
parent80d149f7bfbc9059e96cfda5f7a677a06d425916 (diff)
downloadmitmproxy-ca3e98640c2344da356700635c8d84be1606b411.tar.gz
mitmproxy-ca3e98640c2344da356700635c8d84be1606b411.tar.bz2
mitmproxy-ca3e98640c2344da356700635c8d84be1606b411.zip
fix mitmweb master shutdown, tests++
Diffstat (limited to 'test')
-rw-r--r--test/mitmproxy/data/addonscripts/shutdown.py5
-rw-r--r--test/mitmproxy/tools/test_main.py19
2 files changed, 24 insertions, 0 deletions
diff --git a/test/mitmproxy/data/addonscripts/shutdown.py b/test/mitmproxy/data/addonscripts/shutdown.py
new file mode 100644
index 00000000..51a99b5c
--- /dev/null
+++ b/test/mitmproxy/data/addonscripts/shutdown.py
@@ -0,0 +1,5 @@
+from mitmproxy import ctx
+
+
+def running():
+ ctx.master.shutdown()
diff --git a/test/mitmproxy/tools/test_main.py b/test/mitmproxy/tools/test_main.py
new file mode 100644
index 00000000..88e2fe86
--- /dev/null
+++ b/test/mitmproxy/tools/test_main.py
@@ -0,0 +1,19 @@
+from mitmproxy.test import tutils
+from mitmproxy.tools import main
+
+shutdown_script = tutils.test_data.path("mitmproxy/data/addonscripts/shutdown.py")
+
+
+def test_mitmweb():
+ main.mitmweb([
+ "--no-web-open-browser",
+ "-q",
+ "-s", shutdown_script
+ ])
+
+
+def test_mitmdump():
+ main.mitmdump([
+ "-q",
+ "-s", shutdown_script
+ ])