diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/test_script.py | 80 |
1 files changed, 37 insertions, 43 deletions
diff --git a/test/test_script.py b/test/test_script.py index ad2296ef..69386834 100644 --- a/test/test_script.py +++ b/test/test_script.py @@ -3,26 +3,16 @@ import tutils import shlex import os import time +import mock -class TCounter: - count = 0 - - def __call__(self, *args, **kwargs): - self.count += 1 - - -class TScriptContext(TCounter): - def log(self, msg): - self.__call__() - class TestScript: def test_simple(self): s = flow.State() fm = flow.FlowMaster(None, s) - ctx = flow.ScriptContext(fm) - - p = script.Script(shlex.split(tutils.test_data.path("scripts/a.py")+" --var 40", posix=(os.name != "nt")), ctx) + p = script.Script( + shlex.split(tutils.test_data.path("scripts/a.py")+" --var 40",posix=(os.name != "nt")), fm + ) p.load() assert "here" in p.ns @@ -50,28 +40,26 @@ class TestScript: def test_err(self): s = flow.State() fm = flow.FlowMaster(None, s) - ctx = flow.ScriptContext(fm) - - s = script.Script(["nonexistent"], ctx) + s = script.Script(["nonexistent"], fm) tutils.raises( "no such file", s.load ) - s = script.Script([tutils.test_data.path("scripts")], ctx) + s = script.Script([tutils.test_data.path("scripts")], fm) tutils.raises( "not a file", s.load ) - s = script.Script([tutils.test_data.path("scripts/syntaxerr.py")], ctx) + s = script.Script([tutils.test_data.path("scripts/syntaxerr.py")], fm) tutils.raises( script.ScriptError, s.load ) - s = script.Script([tutils.test_data.path("scripts/loaderr.py")], ctx) + s = script.Script([tutils.test_data.path("scripts/loaderr.py")], fm) tutils.raises( script.ScriptError, s.load @@ -82,38 +70,44 @@ class TestScript: fm = flow.FlowMaster(None, s) fm.load_script([tutils.test_data.path("scripts/concurrent_decorator.py")]) - reply = TCounter() - r1, r2 = tutils.treq(), tutils.treq() - r1.reply, r2.reply = reply, reply - t_start = time.time() - fm.handle_request(r1) - r1.reply() - fm.handle_request(r2) - r2.reply() - assert reply.count < 2 - assert (time.time() - t_start) < 0.09 - time.sleep(0.2) - assert reply.count == 2 + with mock.patch("libmproxy.controller.DummyReply.__call__") as m: + r1, r2 = tutils.treq(), tutils.treq() + t_start = time.time() + fm.handle_request(r1) + r1.reply() + fm.handle_request(r2) + r2.reply() + + # Two instantiations + assert m.call_count == 2 + assert (time.time() - t_start) < 0.09 + time.sleep(0.2) + # Plus two invocations + assert m.call_count == 4 def test_concurrent2(self): - ctx = TScriptContext() - s = script.Script([tutils.test_data.path("scripts/concurrent_decorator.py")], ctx) + s = flow.State() + fm = flow.FlowMaster(None, s) + s = script.Script([tutils.test_data.path("scripts/concurrent_decorator.py")], fm) s.load() f = tutils.tflow_full() f.error = tutils.terr(f.request) f.reply = f.request.reply - s.run("clientconnect", f) - s.run("serverconnect", f) - s.run("response", f) - s.run("error", f) - s.run("clientdisconnect", f) - time.sleep(0.1) - assert ctx.count == 5 + with mock.patch("libmproxy.controller.DummyReply.__call__") as m: + s.run("clientconnect", f) + s.run("serverconnect", f) + s.run("response", f) + s.run("error", f) + s.run("clientdisconnect", f) + time.sleep(0.1) + assert m.call_count == 5 def test_concurrent_err(self): - s = script.Script([tutils.test_data.path("scripts/concurrent_decorator_err.py")], TScriptContext()) + s = flow.State() + fm = flow.FlowMaster(None, s) + s = script.Script([tutils.test_data.path("scripts/concurrent_decorator_err.py")], fm) tutils.raises( "decorator not supported for this method", s.load - )
\ No newline at end of file + ) |