merge smurfix/fix2, add serverconnect hook docs, adjust tests

1 files changed, 12 insertions, 11 deletions

diff --git a/test/scripts/concurrent_decorator.py b/test/scripts/concurrent_decorator.py
index c1c2651e..8e132006 100644
--- a/test/scripts/concurrent_decorator.py
+++ b/test/scripts/concurrent_decorator.py
@@ -1,6 +1,17 @@
 import time
 from libmproxy.script import concurrent
 
+
+@concurrent
+def clientconnect(context, cc):
+    context.log("clientconnect")
+
+
+@concurrent
+def serverconnect(context, sc):
+    context.log("serverconnect")
+
+
 @concurrent
 def request(context, flow):
     time.sleep(0.1)
@@ -17,15 +28,5 @@ def error(context, err):
 
 
 @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
+    context.log("clientdisconnect")
\ No newline at end of file