diff options
| author | Thomas Kriechbaumer <Kriechi@users.noreply.github.com> | 2017-01-19 23:25:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-19 23:25:33 +0100 |
| commit | 9a88a2fdea727c6ab4c20926527ef8a4abae0f40 (patch) | |
| tree | 1864d781b05ae2e564ced10659e9c425da00d209 /test | |
| parent | ea20bfb233a9cad44755417ec0a353bfab116fda (diff) | |
| parent | 72b753c60f7208ee536dc79bd20b3ba93563668b (diff) | |
| download | mitmproxy-9a88a2fdea727c6ab4c20926527ef8a4abae0f40.tar.gz mitmproxy-9a88a2fdea727c6ab4c20926527ef8a4abae0f40.tar.bz2 mitmproxy-9a88a2fdea727c6ab4c20926527ef8a4abae0f40.zip | |
Merge pull request #1941 from Kriechi/sysinfo
provide git information with --version
Diffstat (limited to 'test')
| -rw-r--r-- | test/mitmproxy/addons/test_script.py | 5 | ||||
| -rw-r--r-- | test/mitmproxy/utils/test_debug.py | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/test/mitmproxy/addons/test_script.py b/test/mitmproxy/addons/test_script.py index 777f8f4d..f6fca23e 100644 --- a/test/mitmproxy/addons/test_script.py +++ b/test/mitmproxy/addons/test_script.py @@ -10,6 +10,7 @@ from mitmproxy import exceptions from mitmproxy import options from mitmproxy import proxy from mitmproxy import master +from mitmproxy import utils from mitmproxy.addons import script @@ -72,7 +73,7 @@ class TestParseCommand: script.parse_command(dir) def test_parse_args(self): - with tutils.chdir(tutils.test_data.dirname): + with utils.chdir(tutils.test_data.dirname): assert script.parse_command( "mitmproxy/data/addonscripts/recorder.py" ) == ("mitmproxy/data/addonscripts/recorder.py", []) @@ -85,7 +86,7 @@ class TestParseCommand: @ttutils.skip_not_windows def test_parse_windows(self): - with tutils.chdir(tutils.test_data.dirname): + with utils.chdir(tutils.test_data.dirname): assert script.parse_command( "mitmproxy/data\\addonscripts\\recorder.py" ) == ("mitmproxy/data\\addonscripts\\recorder.py", []) diff --git a/test/mitmproxy/utils/test_debug.py b/test/mitmproxy/utils/test_debug.py index 9acf8192..18f5cdbc 100644 --- a/test/mitmproxy/utils/test_debug.py +++ b/test/mitmproxy/utils/test_debug.py @@ -3,6 +3,10 @@ import io from mitmproxy.utils import debug +def test_dump_system_info(): + assert debug.dump_system_info() + + def test_dump_info(): cs = io.StringIO() debug.dump_info(None, None, file=cs, testing=True) @@ -15,9 +19,5 @@ def test_dump_stacks(): assert cs.getvalue() -def test_sysinfo(): - assert debug.sysinfo() - - def test_register_info_dumpers(): debug.register_info_dumpers() |
