aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mitmproxy/flow.py1
-rw-r--r--mitmproxy/tools/console/flowview.py2
-rw-r--r--test/mitmproxy/test_flow.py1
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):