Magic-Mirror/mitmproxy
1
0
Fork 0
mirror of https://github.com/mitmproxy/mitmproxy.git synced 2024-11-29 08:10:37 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

update tests to reflect changes to options.scripts

Browse Source
This commit is contained in:
Maximilian Hils 2013-06-17 16:48:06 +02:00
parent 84248d431b
commit d462b444b7
8 changed files with 37 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libmproxy/dump.py
View File

@ -121,7 +121,8 @@ class DumpMaster(flow.FlowMaster):
not options.keepserving
)
for script_argv in options.scripts:
scripts = options.scripts or []
for script_argv in scripts:
err = self.load_script(script_argv)
if err:
raise DumpError(err)

6
libmproxy/script.py
View File

@ -46,10 +46,12 @@ class Script:
ns = {}
try:
execfile(path, ns, ns)
self.ns = ns
self.run("start", self.argv)
except Exception, v:
raise ScriptError(traceback.format_exc(v))
self.ns = ns
r = self.run("start", self.argv)
if not r[0] and r[1]:
raise ScriptError(r[1][1])
def unload(self):
return self.run("done")

4
test/test_console.py
View File

@ -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

5
test/test_console_common.py
View File

@ -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

5
test/test_console_contentview.py
View File

@ -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

5
test/test_console_help.py
View File

@ -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:

7
test/test_dump.py
View File

@ -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):

16
test/test_flow.py
View File

@ -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):