diff options
| author | Jim Shaver <dcypherd@gmail.com> | 2015-05-31 01:21:44 -0400 |
|---|---|---|
| committer | Jim Shaver <dcypherd@gmail.com> | 2015-05-31 01:21:44 -0400 |
| commit | b51363b3ca43f6572acb673186e6ae78a1f48434 (patch) | |
| tree | a7488b32871c142141a813dc6ff2ede172672c31 /test/test_script.py | |
| parent | 4fe2c069cca07aadf983f54e18dac4de492d5d69 (diff) | |
| parent | 06fba18106a8f759ec6f08453e86772a170c653b (diff) | |
| download | mitmproxy-b51363b3ca43f6572acb673186e6ae78a1f48434.tar.gz mitmproxy-b51363b3ca43f6572acb673186e6ae78a1f48434.tar.bz2 mitmproxy-b51363b3ca43f6572acb673186e6ae78a1f48434.zip | |
Merge remote-tracking branch 'upstream/master' into print-bracket-fix
Conflicts:
examples/har_extractor.py
examples/nonblocking.py
examples/read_dumpfile
libmproxy/web/app.py
Diffstat (limited to 'test/test_script.py')
| -rw-r--r-- | test/test_script.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/test/test_script.py b/test/test_script.py index aed7def1..0a063740 100644 --- a/test/test_script.py +++ b/test/test_script.py @@ -11,7 +11,7 @@ class TestScript: s = flow.State() fm = flow.FlowMaster(None, s) sp = tutils.test_data.path("scripts/a.py") - p = script.Script("%s --var 40"%sp, fm) + p = script.Script("%s --var 40" % sp, fm) assert "here" in p.ns assert p.run("here") == (True, 41) @@ -79,7 +79,9 @@ class TestScript: def test_concurrent2(self): s = flow.State() fm = flow.FlowMaster(None, s) - s = script.Script(tutils.test_data.path("scripts/concurrent_decorator.py"), fm) + s = script.Script( + tutils.test_data.path("scripts/concurrent_decorator.py"), + fm) s.load() m = mock.Mock() @@ -110,8 +112,9 @@ class TestScript: fm = flow.FlowMaster(None, s) tutils.raises( "decorator not supported for this method", - script.Script, tutils.test_data.path("scripts/concurrent_decorator_err.py"), fm - ) + script.Script, + tutils.test_data.path("scripts/concurrent_decorator_err.py"), + fm) def test_command_parsing(): @@ -120,5 +123,3 @@ def test_command_parsing(): absfilepath = os.path.normcase(tutils.test_data.path("scripts/a.py")) s = script.Script(absfilepath, fm) assert os.path.isfile(s.argv[0]) - - |