From 94fbf066f772032d9ccfdf351c2e50c1488c1d68 Mon Sep 17 00:00:00 2001
From: Maximilian Hils <git@maximilianhils.com>
Date: Mon, 18 Aug 2014 01:47:39 +0200
Subject: fix script tests

---
 libmproxy/proxy/connection.py |  2 ++
 libmproxy/script.py           |  2 +-
 test/test_script.py           | 41 ++++++++++++++++++++++++-----------------
 3 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/libmproxy/proxy/connection.py b/libmproxy/proxy/connection.py
index a269dab1..07129d6a 100644
--- a/libmproxy/proxy/connection.py
+++ b/libmproxy/proxy/connection.py
@@ -17,6 +17,7 @@ class ClientConnection(tcp.BaseHandler, stateobject.SimpleStateObject):
             self.rfile = None
             self.address = None
             self.clientcert = None
+            self.ssl_established = None
 
         self.timestamp_start = utils.timestamp()
         self.timestamp_end = None
@@ -30,6 +31,7 @@ class ClientConnection(tcp.BaseHandler, stateobject.SimpleStateObject):
         )
 
     _stateobject_attributes = dict(
+        ssl_established=bool,
         timestamp_start=float,
         timestamp_end=float,
         timestamp_ssl_setup=float
diff --git a/libmproxy/script.py b/libmproxy/script.py
index b8d6e731..e582c4e8 100644
--- a/libmproxy/script.py
+++ b/libmproxy/script.py
@@ -120,7 +120,7 @@ def _handle_concurrent_reply(fn, o, *args, **kwargs):
 
     def run():
         fn(*args, **kwargs)
-        o.reply()
+        o.reply()  # If the script did not call .reply(), we have to do it now.
     threading.Thread(target=run, name="ScriptThread").start()
 
 
diff --git a/test/test_script.py b/test/test_script.py
index 13903066..587c52d6 100644
--- a/test/test_script.py
+++ b/test/test_script.py
@@ -73,7 +73,7 @@ class TestScript:
             r2.reply()
 
             # Two instantiations
-            assert m.call_count == 2
+            assert m.call_count == 0  # No calls yet.
             assert (time.time() - t_start) < 0.09
 
     def test_concurrent2(self):
@@ -81,22 +81,29 @@ class TestScript:
         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
-
-        with mock.patch("libmproxy.controller.DummyReply.__call__") as m:
-            t_start = time.time()
-            s.run("clientconnect", f)
-            s.run("serverconnect", f)
-            s.run("response", f)
-            s.run("error", f)
-            s.run("clientdisconnect", f)
-            while (time.time() - t_start) < 1 and m.call_count <= 5:
-                if m.call_count == 5:
-                    return
-                time.sleep(0.001)
-            assert False
+        m = mock.Mock()
+
+        class Dummy:
+            def __init__(self):
+                self.response = self
+                self.error = self
+                self.reply = m
+
+        t_start = time.time()
+
+        for hook in ("clientconnect",
+                     "serverconnect",
+                     "response",
+                     "error",
+                     "clientconnect"):
+            d = Dummy()
+            assert s.run(hook, d)[0]
+            d.reply()
+        while (time.time() - t_start) < 5 and m.call_count <= 5:
+            if m.call_count == 5:
+                return
+            time.sleep(0.001)
+        assert False
 
     def test_concurrent_err(self):
         s = flow.State()
-- 
cgit v1.2.3