aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2011-03-06 16:54:49 +1300
committerAldo Cortesi <aldo@nullcube.com>2011-03-06 16:54:49 +1300
commitec00b5a66e44454fce3d347203ad85ce4d8feaf6 (patch)
tree8ccaf7656647fafb1b447463b0d5c1feef716690 /test
parente794cbc0d8932d8dfaf3676fdd3af108e0e9edfd (diff)
downloadmitmproxy-ec00b5a66e44454fce3d347203ad85ce4d8feaf6.tar.gz
mitmproxy-ec00b5a66e44454fce3d347203ad85ce4d8feaf6.tar.bz2
mitmproxy-ec00b5a66e44454fce3d347203ad85ce4d8feaf6.zip
Make mitmdump exit after client replay is complete by default.
Add an option --keepserving to make it keep serving after replay.
Diffstat (limited to 'test')
-rw-r--r--test/test_flow.py14
1 files changed, 10 insertions, 4 deletions
diff --git a/test/test_flow.py b/test/test_flow.py
index b49d9cdf..79e6dcc5 100644
--- a/test/test_flow.py
+++ b/test/test_flow.py
@@ -37,11 +37,12 @@ class uStickyCookieState(libpry.AutoTree):
class uClientPlaybackState(libpry.AutoTree):
def test_tick(self):
first = tutils.tflow()
- c = flow.ClientPlaybackState(
- [first, tutils.tflow()]
- )
s = flow.State()
fm = flow.FlowMaster(None, s)
+ fm.start_client_playback([first, tutils.tflow()], True)
+ c = fm.client_playback
+
+ assert not c.done()
assert not s.flow_count()
assert c.count() == 2
c.tick(fm, testing=True)
@@ -54,7 +55,12 @@ class uClientPlaybackState(libpry.AutoTree):
c.clear(c.current)
c.tick(fm, testing=True)
assert c.count() == 0
+ c.clear(c.current)
+ assert c.done()
+ q = Queue.Queue()
+ fm.state.clear()
+ fm.tick(q)
class uServerPlaybackState(libpry.AutoTree):
@@ -391,7 +397,7 @@ class uFlowMaster(libpry.AutoTree):
pb = [tutils.tflow_full(), f]
fm = flow.FlowMaster(None, s)
assert not fm.start_server_playback(pb, False, [])
- assert not fm.start_client_playback(pb)
+ assert not fm.start_client_playback(pb, False)
q = Queue.Queue()
assert not fm.state.flow_count()