diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/test_console.py | 4 | ||||
| -rw-r--r-- | test/test_console_common.py | 5 | ||||
| -rw-r--r-- | test/test_console_contentview.py | 5 | ||||
| -rw-r--r-- | test/test_console_help.py | 5 | ||||
| -rw-r--r-- | test/test_dump.py | 7 | ||||
| -rw-r--r-- | test/test_flow.py | 16 |
6 files changed, 31 insertions, 11 deletions
diff --git a/test/test_console.py b/test/test_console.py index 498a93bd..4fd9bb9f 100644 --- a/test/test_console.py +++ b/test/test_console.py @@ -1,4 +1,8 @@ import os +from nose.plugins.skip import SkipTest +if os.name == "nt": + raise SkipTest("Skipped on Windows.") + from libmproxy import console from libmproxy.console import common import tutils diff --git a/test/test_console_common.py b/test/test_console_common.py index 29bf7b84..d798e4dc 100644 --- a/test/test_console_common.py +++ b/test/test_console_common.py @@ -1,3 +1,8 @@ +import os +from nose.plugins.skip import SkipTest +if os.name == "nt": + raise SkipTest("Skipped on Windows.") + import libmproxy.console.common as common from libmproxy import utils, flow, encoding import tutils diff --git a/test/test_console_contentview.py b/test/test_console_contentview.py index f6b45f67..ef44f834 100644 --- a/test/test_console_contentview.py +++ b/test/test_console_contentview.py @@ -1,3 +1,8 @@ +import os +from nose.plugins.skip import SkipTest +if os.name == "nt": + raise SkipTest("Skipped on Windows.") + import sys import libmproxy.console.contentview as cv from libmproxy import utils, flow, encoding diff --git a/test/test_console_help.py b/test/test_console_help.py index 98e202ad..6e1f9fad 100644 --- a/test/test_console_help.py +++ b/test/test_console_help.py @@ -1,3 +1,8 @@ +import os +from nose.plugins.skip import SkipTest +if os.name == "nt": + raise SkipTest("Skipped on Windows.") + import libmproxy.console.help as help class DummyMaster: diff --git a/test/test_dump.py b/test/test_dump.py index 6a35cdec..ccfa9189 100644 --- a/test/test_dump.py +++ b/test/test_dump.py @@ -43,6 +43,7 @@ class TestDumpMaster: m = dump.DumpMaster(None, o, filt, outfile=cs) for i in range(n): self._cycle(m, content) + m.shutdown() return cs.getvalue() def _flowfile(self, path): @@ -143,7 +144,7 @@ class TestDumpMaster: def test_script(self): ret = self._dummy_cycle( 1, None, "", - script=tutils.test_data.path("scripts/all.py"), verbosity=0, eventlog=True + scripts=[[tutils.test_data.path("scripts/all.py")]], verbosity=0, eventlog=True ) assert "XCLIENTCONNECT" in ret assert "XREQUEST" in ret @@ -151,11 +152,11 @@ class TestDumpMaster: assert "XCLIENTDISCONNECT" in ret tutils.raises( dump.DumpError, - self._dummy_cycle, 1, None, "", script="nonexistent" + self._dummy_cycle, 1, None, "", scripts=[["nonexistent"]] ) tutils.raises( dump.DumpError, - self._dummy_cycle, 1, None, "", script="starterr.py" + self._dummy_cycle, 1, None, "", scripts=[["starterr.py"]] ) def test_stickycookie(self): diff --git a/test/test_flow.py b/test/test_flow.py index 21d64f95..eacd7c25 100644 --- a/test/test_flow.py +++ b/test/test_flow.py @@ -542,12 +542,12 @@ class TestFlowMaster: def test_load_script(self): s = flow.State() fm = flow.FlowMaster(None, s) - assert not fm.load_script(tutils.test_data.path("scripts/a.py")) - assert not fm.load_script(tutils.test_data.path("scripts/a.py")) + assert not fm.load_script([tutils.test_data.path("scripts/a.py")]) + assert not fm.load_script([tutils.test_data.path("scripts/a.py")]) assert not fm.unload_script(fm.scripts[0]) assert not fm.unload_script(fm.scripts[0]) - assert fm.load_script("nonexistent") - assert "ValueError" in fm.load_script(tutils.test_data.path("scripts/starterr.py")) + assert fm.load_script(["nonexistent"]) + assert "ValueError" in fm.load_script([tutils.test_data.path("scripts/starterr.py")]) assert len(fm.scripts) == 0 def test_replay(self): @@ -563,7 +563,7 @@ class TestFlowMaster: def test_script_reqerr(self): s = flow.State() fm = flow.FlowMaster(None, s) - assert not fm.load_script(tutils.test_data.path("scripts/reqerr.py")) + assert not fm.load_script([tutils.test_data.path("scripts/reqerr.py")]) req = tutils.treq() fm.handle_clientconnect(req.client_conn) assert fm.handle_request(req) @@ -571,7 +571,7 @@ class TestFlowMaster: def test_script(self): s = flow.State() fm = flow.FlowMaster(None, s) - assert not fm.load_script(tutils.test_data.path("scripts/all.py")) + assert not fm.load_script([tutils.test_data.path("scripts/all.py")]) req = tutils.treq() fm.handle_clientconnect(req.client_conn) assert fm.scripts[0].ns["log"][-1] == "clientconnect" @@ -581,7 +581,7 @@ class TestFlowMaster: fm.handle_response(resp) assert fm.scripts[0].ns["log"][-1] == "response" #load second script - assert not fm.load_script(tutils.test_data.path("scripts/all.py")) + assert not fm.load_script([tutils.test_data.path("scripts/all.py")]) assert len(fm.scripts) == 2 dc = flow.ClientDisconnect(req.client_conn) dc.reply = controller.DummyReply() @@ -634,7 +634,7 @@ class TestFlowMaster: err.reply = controller.DummyReply() fm.handle_error(err) - fm.load_script(tutils.test_data.path("scripts/a.py")) + fm.load_script([tutils.test_data.path("scripts/a.py")]) fm.shutdown() def test_client_playback(self): |