Move intercept options to addon

As part of this, we zap an un-needed console command and use a boolean toggle
setter instead.

Also remove an ancient regression test that breaks encapsulation.

2 files changed, 1 insertions, 16 deletions

diff --git a/test/mitmproxy/addons/test_intercept.py b/test/mitmproxy/addons/test_intercept.py
index d9598101..b3d24626 100644
--- a/test/mitmproxy/addons/test_intercept.py
+++ b/test/mitmproxy/addons/test_intercept.py
@@ -8,7 +8,7 @@ from mitmproxy.test import tflow
 
 def test_simple():
     r = intercept.Intercept()
-    with taddons.context() as tctx:
+    with taddons.context(r) as tctx:
         assert not r.filt
         tctx.configure(r, intercept="~q")
         assert r.filt
diff --git a/test/mitmproxy/tools/console/test_master.py b/test/mitmproxy/tools/console/test_master.py
index 6ea61991..5be035e8 100644
--- a/test/mitmproxy/tools/console/test_master.py
+++ b/test/mitmproxy/tools/console/test_master.py
@@ -1,8 +1,6 @@
 import urwid
 
 from mitmproxy import options
-from mitmproxy.test import tflow
-from mitmproxy.test import tutils
 from mitmproxy.tools import console
 from ... import tservers
 
@@ -24,16 +22,3 @@ class TestMaster(tservers.MasterTest):
             except urwid.ExitMainLoop:
                 pass
             assert len(m.view) == i
-
-    def test_intercept(self):
-        """regression test for https://github.com/mitmproxy/mitmproxy/issues/1605"""
-        m = self.mkmaster(intercept="~b bar")
-        f = tflow.tflow(req=tutils.treq(content=b"foo"))
-        m.addons.handle_lifecycle("request", f)
-        assert not m.view[0].intercepted
-        f = tflow.tflow(req=tutils.treq(content=b"bar"))
-        m.addons.handle_lifecycle("request", f)
-        assert m.view[1].intercepted
-        f = tflow.tflow(resp=tutils.tresp(content=b"bar"))
-        m.addons.handle_lifecycle("request", f)
-        assert m.view[2].intercepted