diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2016-10-22 19:22:50 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-22 19:22:50 -0700 |
| commit | ea2d6474bf1e9c4c1fd2e4a6ac33e0785fc751de (patch) | |
| tree | f1d9e4da3210d7e2c20ed5274bf3ba9ceca53e75 | |
| parent | c09cedd0f850a863665c67ecc0a6166488a0f8cb (diff) | |
| parent | 6170493615d0fda65af1479543e13d4a2a531dae (diff) | |
| download | mitmproxy-ea2d6474bf1e9c4c1fd2e4a6ac33e0785fc751de.tar.gz mitmproxy-ea2d6474bf1e9c4c1fd2e4a6ac33e0785fc751de.tar.bz2 mitmproxy-ea2d6474bf1e9c4c1fd2e4a6ac33e0785fc751de.zip | |
Merge pull request #1649 from cortesi/kill
Don't call error for flow kill
| -rw-r--r-- | mitmproxy/flow.py | 1 | ||||
| -rw-r--r-- | mitmproxy/tools/console/flowview.py | 2 | ||||
| -rw-r--r-- | test/mitmproxy/test_flow.py | 1 |
3 files changed, 1 insertions, 3 deletions
diff --git a/mitmproxy/flow.py b/mitmproxy/flow.py index 2fb7ace0..a23abf5f 100644 --- a/mitmproxy/flow.py +++ b/mitmproxy/flow.py @@ -165,7 +165,6 @@ class Flow(stateobject.StateObject): self.reply.take() self.reply.kill(force=True) self.reply.commit() - master.error(self) def intercept(self, master): """ diff --git a/mitmproxy/tools/console/flowview.py b/mitmproxy/tools/console/flowview.py index 4e886ee4..5ac61bb7 100644 --- a/mitmproxy/tools/console/flowview.py +++ b/mitmproxy/tools/console/flowview.py @@ -480,7 +480,7 @@ class FlowView(tabs.Tabs): else: new_flow, new_idx = self.state.get_prev(idx) if new_flow is None: - signals.status_message.send(message="No more flows!") + signals.status_message.send(message="No more flows") else: signals.pop_view_state.send(self) self.master.view_flow(new_flow, self.tab_offset) diff --git a/test/mitmproxy/test_flow.py b/test/mitmproxy/test_flow.py index d16bb6dd..ed15a766 100644 --- a/test/mitmproxy/test_flow.py +++ b/test/mitmproxy/test_flow.py @@ -104,7 +104,6 @@ class TestHTTPFlow: assert f.killable f.kill(fm) assert not f.killable - assert fm.error.called assert f.reply.value == Kill def test_killall(self): |