aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2011-08-04 10:14:44 +1200
committerAldo Cortesi <aldo@nullcube.com>2011-08-04 10:14:44 +1200
commit730c78ac53672c4ef2f3d1067aa50e8adeee7f24 (patch)
tree2a52d70f6236b6aed1d6772decaa67615d873fdf /test
parent1662b8505b7e1207eae0f34670a313e457007255 (diff)
downloadmitmproxy-730c78ac53672c4ef2f3d1067aa50e8adeee7f24.tar.gz
mitmproxy-730c78ac53672c4ef2f3d1067aa50e8adeee7f24.tar.bz2
mitmproxy-730c78ac53672c4ef2f3d1067aa50e8adeee7f24.zip
Move script.Context to flow.ScriptContext
Diffstat (limited to 'test')
-rw-r--r--test/test_script.py13
1 files changed, 8 insertions, 5 deletions
diff --git a/test/test_script.py b/test/test_script.py
index 9a1c3062..32ee2d95 100644
--- a/test/test_script.py
+++ b/test/test_script.py
@@ -6,8 +6,9 @@ class uScript(libpry.AutoTree):
def test_simple(self):
s = flow.State()
fm = flow.FlowMaster(None, s)
+ ctx = flow.ScriptContext(fm)
- p = script.Script(os.path.join("scripts", "a.py"), fm)
+ p = script.Script(os.path.join("scripts", "a.py"), ctx)
p.load()
assert "here" in p.ns
assert p.run("here") == (True, 1)
@@ -24,26 +25,28 @@ class uScript(libpry.AutoTree):
def test_err(self):
s = flow.State()
fm = flow.FlowMaster(None, s)
+ ctx = flow.ScriptContext(fm)
- s = script.Script("nonexistent", fm)
+
+ s = script.Script("nonexistent", ctx)
libpry.raises(
"no such file",
s.load
)
- s = script.Script("scripts", fm)
+ s = script.Script("scripts", ctx)
libpry.raises(
"not a file",
s.load
)
- s = script.Script("scripts/syntaxerr.py", fm)
+ s = script.Script("scripts/syntaxerr.py", ctx)
libpry.raises(
script.ScriptError,
s.load
)
- s = script.Script("scripts/loaderr.py", fm)
+ s = script.Script("scripts/loaderr.py", ctx)
libpry.raises(
script.ScriptError,
s.load