diff options
author | Aldo Cortesi <aldo@nullcube.com> | 2012-06-09 13:42:43 +1200 |
---|---|---|
committer | Aldo Cortesi <aldo@nullcube.com> | 2012-06-09 13:42:43 +1200 |
commit | b7b357528c3d3867f1a29400de3a11f2d976e60d (patch) | |
tree | 2312713e8c01d8532e2f5f12b31e97a3688eba15 /libmproxy/flow.py | |
parent | a63240a8483c0bbc52218380c0c70da46a29f75b (diff) | |
download | mitmproxy-b7b357528c3d3867f1a29400de3a11f2d976e60d.tar.gz mitmproxy-b7b357528c3d3867f1a29400de3a11f2d976e60d.tar.bz2 mitmproxy-b7b357528c3d3867f1a29400de3a11f2d976e60d.zip |
Port mitmproxy test suite entirely to nose.
Diffstat (limited to 'libmproxy/flow.py')
-rw-r--r-- | libmproxy/flow.py | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/libmproxy/flow.py b/libmproxy/flow.py index 6b3d868e..bb9d34f8 100644 --- a/libmproxy/flow.py +++ b/libmproxy/flow.py @@ -903,9 +903,7 @@ class ClientPlaybackState: n.request.client_conn = None self.current = master.handle_request(n.request) if not testing and not self.current.response: - #begin nocover - master.replay_request(self.current) - #end nocover + master.replay_request(self.current) # pragma: no cover elif self.current.response: master.handle_response(self.current.response) @@ -1498,7 +1496,6 @@ class FlowMaster(controller.Master): return "Can't replay while intercepting..." if f.request.content == CONTENT_MISSING: return "Can't replay request with missing content..." - #begin nocover if f.request: f.request._set_replay() if f.request.content: @@ -1511,8 +1508,7 @@ class FlowMaster(controller.Master): f, self.masterq, ) - rt.start() - #end nocover + rt.start() # pragma: no cover def run_script_hook(self, name, *args, **kwargs): if self.script and not self.pause_scripts: |