3 files changed, 88 insertions, 8 deletions
diff --git a/test/scripts/concurrent_decorator.py b/test/scripts/concurrent_decorator.py
new file mode 100644
index 00000000..c1c2651e
--- /dev/null
+++ b/test/scripts/concurrent_decorator.py
@@ -0,0 +1,31 @@
+import time
+from libmproxy.script import concurrent
+
+@concurrent
+def request(context, flow):
+    time.sleep(0.1)
+
+
+@concurrent
+def response(context, flow):
+    context.log("response")
+
+
+@concurrent
+def error(context, err):
+    context.log("error")
+
+
+@concurrent
+def clientconnect(context, cc):
+    context.log("clientconnect")
+
+
+@concurrent
+def clientdisconnect(context, dc):
+    context.log("clientdisconnect")
+
+
+@concurrent
+def serverconnect(context, sc):
+    context.log("serverconnect")
+\ No newline at end of file
diff --git a/test/test_script.py b/test/test_script.py
index 9033c4fc..296ec828 100644
--- a/test/test_script.py
+++ b/test/test_script.py
@@ -2,6 +2,19 @@ from libmproxy import script, flow
 import tutils
 import shlex
 import os
+import time
+
+
+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):
@@ -64,3 +77,36 @@ class TestScript:
             s.load
         )
 
+    def test_concurrent(self):
+        s = flow.State()
+        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
+
+    def test_concurrent2(self):
+        ctx = TScriptContext()
+        s = script.Script(["scripts/concurrent_decorator.py"], ctx)
+        s.load()
+        f = tutils.tflow_full()
+        f.error = tutils.terr(f.request)
+        f.reply = f.request.reply
+
+        print s.run("response", f)
+        print s.run("error", f)
+        print s.run("clientconnect", f)
+        print s.run("clientdisconnect", f)
+        print s.run("serverconnect", f)
+        time.sleep(0.1)
+        assert ctx.count == 5
+\ No newline at end of file
diff --git a/test/tutils.py b/test/tutils.py
index e42256ed..4cd7b7f8 100644
--- a/test/tutils.py
+++ b/test/tutils.py
@@ -33,6 +33,13 @@ def tresp(req=None):
     resp.reply = controller.DummyReply()
     return resp
 
+def terr(req=None):
+    if not req:
+        req = treq()
+    err = flow.Error(req, "error")
+    err.reply = controller.DummyReply()
+    return err
+
 
 def tflow():
     r = treq()
@@ -40,21 +47,17 @@ def tflow():
 
 
 def tflow_full():
-    r = treq()
-    f = flow.Flow(r)
-    f.response = tresp(r)
+    f = tflow()
+    f.response = tresp(f.request)
     return f
 
 
 def tflow_err():
-    r = treq()
-    f = flow.Flow(r)
-    f.error = flow.Error(r, "error")
-    f.error.reply = controller.DummyReply()
+    f = tflow()
+    f.error = terr(f.request)
     return f
 
 
-
 @contextmanager
 def tmpdir(*args, **kwargs):
     orig_workdir = os.getcwd()