From 6170493615d0fda65af1479543e13d4a2a531dae Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Sat, 22 Oct 2016 15:54:45 +1300 Subject: Don't call error for flow kill This is now the error handler on master, so whatever the intetion was it's now definitely wrong. --- mitmproxy/flow.py | 1 - mitmproxy/tools/console/flowview.py | 2 +- test/mitmproxy/test_flow.py | 1 - 3 files changed, 1 insertion(+), 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 5b9f3835..6ba23579 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): -- cgit v1.2.3