aboutsummaryrefslogtreecommitdiffstats
path: root/test/test_script.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2014-09-03 16:57:56 +0200
committerMaximilian Hils <git@maximilianhils.com>2014-09-03 16:57:56 +0200
commitb0cfeff06d9dd99a16dfae19c5df3c73c5864fb9 (patch)
tree9204cb67becedded525d57581efbed947225b3e2 /test/test_script.py
parent951a6fcc36780a0bd5a1f1ff718327d1c6d4fc5e (diff)
downloadmitmproxy-b0cfeff06d9dd99a16dfae19c5df3c73c5864fb9.tar.gz
mitmproxy-b0cfeff06d9dd99a16dfae19c5df3c73c5864fb9.tar.bz2
mitmproxy-b0cfeff06d9dd99a16dfae19c5df3c73c5864fb9.zip
fix #341 - work on flows instead of request/response internally.
Diffstat (limited to 'test/test_script.py')
-rw-r--r--test/test_script.py14
1 files changed, 7 insertions, 7 deletions
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.