diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2017-08-22 00:31:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-22 00:31:00 +0200 |
| commit | 7e154171bffbe30c990dd4a522bc65a3a72f2975 (patch) | |
| tree | bbdf8c0841dbd8a0f74fb77d9eb5caf8cabac60d /test | |
| parent | 194883fc6a57b7646a0c045003152c270362dcea (diff) | |
| parent | ca3e98640c2344da356700635c8d84be1606b411 (diff) | |
| download | mitmproxy-7e154171bffbe30c990dd4a522bc65a3a72f2975.tar.gz mitmproxy-7e154171bffbe30c990dd4a522bc65a3a72f2975.tar.bz2 mitmproxy-7e154171bffbe30c990dd4a522bc65a3a72f2975.zip | |
Merge pull request #2539 from mhils/fix-mitmweb-shutdown
Fix mitmweb master shutdown, tests++
Diffstat (limited to 'test')
| -rw-r--r-- | test/mitmproxy/data/addonscripts/shutdown.py | 5 | ||||
| -rw-r--r-- | test/mitmproxy/tools/test_main.py | 19 |
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 + ]) |