aboutsummaryrefslogtreecommitdiffstats
path: root/test/test_flow.py
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2014-09-14 11:46:01 +1200
committerAldo Cortesi <aldo@nullcube.com>2014-09-14 11:46:01 +1200
commit17868f61a98cb97e6b17ee58e6211e4fa89e62d4 (patch)
tree090e17a6753e59088457ab5424dd45908dac0a9f /test/test_flow.py
parent81e3a6e8e661b212bf45fb37623556f2793d2184 (diff)
downloadmitmproxy-17868f61a98cb97e6b17ee58e6211e4fa89e62d4.tar.gz
mitmproxy-17868f61a98cb97e6b17ee58e6211e4fa89e62d4.tar.bz2
mitmproxy-17868f61a98cb97e6b17ee58e6211e4fa89e62d4.zip
Remove external app option, make tick timeout explicit
Diffstat (limited to 'test/test_flow.py')
-rw-r--r--test/test_flow.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/test/test_flow.py b/test/test_flow.py
index a297bf5f..cb899e2a 100644
--- a/test/test_flow.py
+++ b/test/test_flow.py
@@ -103,7 +103,7 @@ class TestClientPlaybackState:
q = Queue.Queue()
fm.state.clear()
- fm.tick(q)
+ fm.tick(q, timeout=0)
fm.stop_client_playback()
assert not fm.client_playback
@@ -645,7 +645,7 @@ class TestFlowMaster:
q = Queue.Queue()
assert not fm.state.flow_count()
- fm.tick(q)
+ fm.tick(q, 0)
assert fm.state.flow_count()
f.error = Error("error")
@@ -673,7 +673,7 @@ class TestFlowMaster:
fm.start_server_playback(pb, False, [], True, False)
q = Queue.Queue()
- fm.tick(q)
+ fm.tick(q, 0)
assert fm.should_exit.is_set()
fm.stop_server_playback()