From b0cfeff06d9dd99a16dfae19c5df3c73c5864fb9 Mon Sep 17 00:00:00 2001
From: Maximilian Hils <git@maximilianhils.com>
Date: Wed, 3 Sep 2014 16:57:56 +0200
Subject: fix #341 - work on flows instead of request/response internally.

---
 test/test_script.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'test/test_script.py')

diff --git a/test/test_script.py b/test/test_script.py
index 587c52d6..7c421fde 100644
--- a/test/test_script.py
+++ b/test/test_script.py
@@ -29,8 +29,8 @@ class TestScript:
         s = flow.State()
         fm = flow.FlowMaster(None, s)
         fm.load_script(tutils.test_data.path("scripts/duplicate_flow.py"))
-        r = tutils.treq()
-        fm.handle_request(r)
+        f = tutils.tflow()
+        fm.handle_request(f)
         assert fm.state.flow_count() == 2
         assert not fm.state.view[0].request.is_replay
         assert fm.state.view[1].request.is_replay
@@ -65,12 +65,12 @@ class TestScript:
         fm.load_script(tutils.test_data.path("scripts/concurrent_decorator.py"))
 
         with mock.patch("libmproxy.controller.DummyReply.__call__") as m:
-            r1, r2 = tutils.treq(), tutils.treq()
+            f1, f2 = tutils.tflow(), tutils.tflow()
             t_start = time.time()
-            fm.handle_request(r1)
-            r1.reply()
-            fm.handle_request(r2)
-            r2.reply()
+            fm.handle_request(f1)
+            f1.reply()
+            fm.handle_request(f2)
+            f2.reply()
 
             # Two instantiations
             assert m.call_count == 0  # No calls yet.
-- 
cgit v1.2.3


From a7a3b5703adff7de12fb479a90ea2628465a4486 Mon Sep 17 00:00:00 2001
From: Maximilian Hils <git@maximilianhils.com>
Date: Fri, 5 Sep 2014 00:18:17 +0200
Subject: change replay_request behaviour, refs #346; test upstream proxy mode

---
 test/test_script.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'test/test_script.py')

diff --git a/test/test_script.py b/test/test_script.py
index 7c421fde..aed7def1 100644
--- a/test/test_script.py
+++ b/test/test_script.py
@@ -99,7 +99,7 @@ class TestScript:
             d = Dummy()
             assert s.run(hook, d)[0]
             d.reply()
-        while (time.time() - t_start) < 5 and m.call_count <= 5:
+        while (time.time() - t_start) < 20 and m.call_count <= 5:
             if m.call_count == 5:
                 return
             time.sleep(0.001)
-- 
cgit v1.2.3