diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2013-01-05 21:41:16 +1300 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2013-01-05 21:56:33 +1300 |
| commit | 9cfc785cd3092591a4b020dc03b890fb968bba3f (patch) | |
| tree | c9b73df045977daeb38dcbeba98141186461dc2c /libmproxy | |
| parent | 46ab6ed4912039e19c17cc4346bf562f2acdc8a9 (diff) | |
| download | mitmproxy-9cfc785cd3092591a4b020dc03b890fb968bba3f.tar.gz mitmproxy-9cfc785cd3092591a4b020dc03b890fb968bba3f.tar.bz2 mitmproxy-9cfc785cd3092591a4b020dc03b890fb968bba3f.zip | |
Unit test love - 100% for flow.py, dump.py
Diffstat (limited to 'libmproxy')
| -rw-r--r-- | libmproxy/flow.py | 6 |
1 files changed, 2 insertions, 4 deletions
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): |