diff options
author | Nikos Filippakis <nikolaos.filippakis@cern.ch> | 2017-03-24 00:15:25 +0100 |
---|---|---|
committer | Nikos Filippakis <nikolaos.filippakis@cern.ch> | 2017-03-24 02:35:02 +0100 |
commit | abf291b0f943e0755b2e7fb0be5c429a50324881 (patch) | |
tree | 00d534d9220d7be2d1b3fcdc95b6acf0ee5bef41 /test | |
parent | 1e81747a2afb142bc6ef5c53c6d4572b94ee4495 (diff) | |
download | mitmproxy-abf291b0f943e0755b2e7fb0be5c429a50324881.tar.gz mitmproxy-abf291b0f943e0755b2e7fb0be5c429a50324881.tar.bz2 mitmproxy-abf291b0f943e0755b2e7fb0be5c429a50324881.zip |
scripts: redirect stdout to ctx.log.warn
Redirect messages written to stdout in scripts to ctx.log.warn.
(closes #1530)
Signed-off-by: Nikos Filippakis <nikolaos.filippakis@cern.ch>
Diffstat (limited to 'test')
-rw-r--r-- | test/mitmproxy/addons/test_script.py | 27 | ||||
-rw-r--r-- | test/mitmproxy/data/addonscripts/print.py | 2 |
2 files changed, 23 insertions, 6 deletions
diff --git a/test/mitmproxy/addons/test_script.py b/test/mitmproxy/addons/test_script.py index 16827488..84d36e2a 100644 --- a/test/mitmproxy/addons/test_script.py +++ b/test/mitmproxy/addons/test_script.py @@ -5,6 +5,7 @@ import re import watchdog.events import pytest +from unittest import mock from mitmproxy.test import tflow from mitmproxy.test import tutils from mitmproxy.test import taddons @@ -97,12 +98,26 @@ class TestParseCommand: def test_load_script(): - ns = script.load_script( - tutils.test_data.path( - "mitmproxy/data/addonscripts/recorder.py" - ), [] - ) - assert ns.start + with taddons.context(): + ns = script.load_script( + tutils.test_data.path( + "mitmproxy/data/addonscripts/recorder.py" + ), [] + ) + assert ns.start + + +def test_script_print_stdout(): + with taddons.context() as tctx: + with mock.patch('mitmproxy.ctx.log.warn') as mock_warn: + with script.scriptenv("path", []): + ns = script.load_script( + tutils.test_data.path( + "mitmproxy/data/addonscripts/print.py" + ), [] + ) + ns.start(tctx.options) + mock_warn.assert_called_once_with("stdoutprint") class TestScript: diff --git a/test/mitmproxy/data/addonscripts/print.py b/test/mitmproxy/data/addonscripts/print.py new file mode 100644 index 00000000..fdfcc3d9 --- /dev/null +++ b/test/mitmproxy/data/addonscripts/print.py @@ -0,0 +1,2 @@ +def start(opts): + print("stdoutprint") |