From 9cfc785cd3092591a4b020dc03b890fb968bba3f Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Sat, 5 Jan 2013 21:41:16 +1300 Subject: Unit test love - 100% for flow.py, dump.py --- libmproxy/flow.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'libmproxy') diff --git a/libmproxy/flow.py b/libmproxy/flow.py index 8e4c2117..a9d4e12d 100644 --- a/libmproxy/flow.py +++ b/libmproxy/flow.py @@ -1375,6 +1375,8 @@ class FlowMaster(controller.Master): self.kill_nonreplay = kill def stop_server_playback(self): + if self.server_playback.exit: + self.shutdown() self.server_playback = None def do_server_playback(self, flow): @@ -1408,10 +1410,6 @@ class FlowMaster(controller.Master): self.shutdown() self.client_playback.tick(self) - if self.server_playback: - if self.server_playback.exit and self.server_playback.count() == 0: - self.shutdown() - return controller.Master.tick(self, q) def duplicate_flow(self, f): -- cgit v1.2.3