26 files changed, 49 insertions, 47 deletions
diff --git a/test/mitmproxy/builtins/__init__.py b/test/mitmproxy/addons/__init__.py
index e69de29b..e69de29b 100644
--- a/test/mitmproxy/builtins/__init__.py
+++ b/test/mitmproxy/addons/__init__.py
diff --git a/test/mitmproxy/builtins/test_anticache.py b/test/mitmproxy/addons/test_anticache.py
index 790ae97d..f7418f38 100644
--- a/test/mitmproxy/builtins/test_anticache.py
+++ b/test/mitmproxy/addons/test_anticache.py
@@ -1,5 +1,5 @@
 from .. import tutils, mastertest
-from mitmproxy.builtins import anticache
+from mitmproxy.addons import anticache
 from mitmproxy import master
 from mitmproxy import options
 from mitmproxy import proxy
diff --git a/test/mitmproxy/builtins/test_anticomp.py b/test/mitmproxy/addons/test_anticomp.py
index d5a0d6eb..5f95013f 100644
--- a/test/mitmproxy/builtins/test_anticomp.py
+++ b/test/mitmproxy/addons/test_anticomp.py
@@ -1,5 +1,5 @@
 from .. import tutils, mastertest
-from mitmproxy.builtins import anticomp
+from mitmproxy.addons import anticomp
 from mitmproxy import master
 from mitmproxy import options
 from mitmproxy import proxy
diff --git a/test/mitmproxy/builtins/test_clientplayback.py b/test/mitmproxy/addons/test_clientplayback.py
index e2c5be7e..c5407d18 100644
--- a/test/mitmproxy/builtins/test_clientplayback.py
+++ b/test/mitmproxy/addons/test_clientplayback.py
@@ -1,6 +1,6 @@
 import mock
 
-from mitmproxy.builtins import clientplayback
+from mitmproxy.addons import clientplayback
 from mitmproxy import options
 
 from .. import tutils, mastertest
diff --git a/test/mitmproxy/builtins/test_dumper.py b/test/mitmproxy/addons/test_dumper.py
index d5291bc4..ce2d2de9 100644
--- a/test/mitmproxy/builtins/test_dumper.py
+++ b/test/mitmproxy/addons/test_dumper.py
@@ -2,7 +2,7 @@ import io
 
 from .. import tutils, mastertest
 
-from mitmproxy.builtins import dumper
+from mitmproxy.addons import dumper
 from mitmproxy import exceptions
 from mitmproxy import dump
 from mitmproxy import models
diff --git a/test/mitmproxy/builtins/test_filestreamer.py b/test/mitmproxy/addons/test_filestreamer.py
index 35fe1ca2..a85fcd0c 100644
--- a/test/mitmproxy/builtins/test_filestreamer.py
+++ b/test/mitmproxy/addons/test_filestreamer.py
@@ -2,7 +2,7 @@ from .. import tutils, mastertest
 
 import os.path
 
-from mitmproxy.builtins import filestreamer
+from mitmproxy.addons import filestreamer
 from mitmproxy import master
 from mitmproxy.flow import io
 from mitmproxy import options
diff --git a/test/mitmproxy/builtins/test_onboarding.py b/test/mitmproxy/addons/test_onboarding.py
index 3226aec3..63125c23 100644
--- a/test/mitmproxy/builtins/test_onboarding.py
+++ b/test/mitmproxy/addons/test_onboarding.py
@@ -1,4 +1,4 @@
-from mitmproxy.builtins import onboarding
+from mitmproxy.addons import onboarding
 from .. import tservers
 
 
diff --git a/test/mitmproxy/builtins/test_replace.py b/test/mitmproxy/addons/test_replace.py
index 35f3d430..94c2f832 100644
--- a/test/mitmproxy/builtins/test_replace.py
+++ b/test/mitmproxy/addons/test_replace.py
@@ -1,5 +1,5 @@
 from .. import tutils, mastertest, tservers
-from mitmproxy.builtins import replace
+from mitmproxy.addons import replace
 from mitmproxy import master
 from mitmproxy import options
 from mitmproxy import proxy
diff --git a/test/mitmproxy/builtins/test_script.py b/test/mitmproxy/addons/test_script.py
index ab4343b5..83e60fbd 100644
--- a/test/mitmproxy/builtins/test_script.py
+++ b/test/mitmproxy/addons/test_script.py
@@ -7,7 +7,7 @@ import re
 from mitmproxy import exceptions
 from mitmproxy import options
 from mitmproxy import proxy
-from mitmproxy.builtins import script
+from mitmproxy.addons import script
 from mitmproxy import master
 
 from .. import tutils, mastertest
diff --git a/test/mitmproxy/builtins/test_serverplayback.py b/test/mitmproxy/addons/test_serverplayback.py
index c51814f5..649b3c22 100644
--- a/test/mitmproxy/builtins/test_serverplayback.py
+++ b/test/mitmproxy/addons/test_serverplayback.py
@@ -1,7 +1,7 @@
 from .. import tutils, mastertest
 
 import netlib.tutils
-from mitmproxy.builtins import serverplayback
+from mitmproxy.addons import serverplayback
 from mitmproxy import options
 from mitmproxy import proxy
 from mitmproxy import exceptions
diff --git a/test/mitmproxy/builtins/test_setheaders.py b/test/mitmproxy/addons/test_setheaders.py
index bac8b02e..0fbbd4cb 100644
--- a/test/mitmproxy/builtins/test_setheaders.py
+++ b/test/mitmproxy/addons/test_setheaders.py
@@ -1,6 +1,6 @@
 from .. import tutils, mastertest
 
-from mitmproxy.builtins import setheaders
+from mitmproxy.addons import setheaders
 from mitmproxy import options
 from mitmproxy import proxy
 
diff --git a/test/mitmproxy/test_flow_state.py b/test/mitmproxy/addons/test_state.py
index 05f4cbb4..71c46dcb 100644
--- a/test/mitmproxy/test_flow_state.py
+++ b/test/mitmproxy/addons/test_state.py
@@ -1,12 +1,13 @@
-from mitmproxy import flow
 from mitmproxy import proxy
 from mitmproxy import master
-from . import tutils
+from mitmproxy.addons import state
+
+from .. import tutils
 
 
 class TestState:
     def test_duplicate_flow(self):
-        s = flow.State()
+        s = state.State()
         fm = master.Master(None, proxy.DummyServer())
         fm.addons.add(s)
         f = tutils.tflow(resp=True)
diff --git a/test/mitmproxy/builtins/test_stickyauth.py b/test/mitmproxy/addons/test_stickyauth.py
index 22523548..459dc5f7 100644
--- a/test/mitmproxy/builtins/test_stickyauth.py
+++ b/test/mitmproxy/addons/test_stickyauth.py
@@ -1,5 +1,5 @@
 from .. import tutils, mastertest
-from mitmproxy.builtins import stickyauth
+from mitmproxy.addons import stickyauth
 from mitmproxy import master
 from mitmproxy import options
 from mitmproxy import proxy
diff --git a/test/mitmproxy/builtins/test_stickycookie.py b/test/mitmproxy/addons/test_stickycookie.py
index c70b03d8..29c9e198 100644
--- a/test/mitmproxy/builtins/test_stickycookie.py
+++ b/test/mitmproxy/addons/test_stickycookie.py
@@ -1,5 +1,5 @@
 from .. import tutils, mastertest
-from mitmproxy.builtins import stickycookie
+from mitmproxy.addons import stickycookie
 from mitmproxy import master
 from mitmproxy import options
 from mitmproxy import proxy
diff --git a/test/mitmproxy/builtins/test_streambodies.py b/test/mitmproxy/addons/test_streambodies.py
index 4a8c2474..cf416c86 100644
--- a/test/mitmproxy/builtins/test_streambodies.py
+++ b/test/mitmproxy/addons/test_streambodies.py
@@ -3,7 +3,7 @@ from mitmproxy import master
 from mitmproxy import options
 from mitmproxy import proxy
 
-from mitmproxy.builtins import streambodies
+from mitmproxy.addons import streambodies
 
 
 class TestStreamBodies(mastertest.MasterTest):
diff --git a/test/mitmproxy/builtins/test_termlog.py b/test/mitmproxy/addons/test_termlog.py
index 1564b53f..a9f18a51 100644
--- a/test/mitmproxy/builtins/test_termlog.py
+++ b/test/mitmproxy/addons/test_termlog.py
@@ -1,8 +1,8 @@
 from .. import mastertest
 import io
 
-from mitmproxy.builtins import termlog
-from mitmproxy import controller
+from mitmproxy.addons import termlog
+from mitmproxy import log
 from mitmproxy import dump
 
 
@@ -11,7 +11,7 @@ class TestTermLog(mastertest.MasterTest):
         t = termlog.TermLog()
         sio = io.StringIO()
         t.configure(dump.Options(tfile = sio, verbosity = 2), set([]))
-        t.log(controller.LogEntry("one", "info"))
+        t.log(log.LogEntry("one", "info"))
         assert "one" in sio.getvalue()
-        t.log(controller.LogEntry("two", "debug"))
+        t.log(log.LogEntry("two", "debug"))
         assert "two" not in sio.getvalue()
diff --git a/test/mitmproxy/builtins/test_wsgiapp.py b/test/mitmproxy/addons/test_wsgiapp.py
index a39ec5c3..760ee460 100644
--- a/test/mitmproxy/builtins/test_wsgiapp.py
+++ b/test/mitmproxy/addons/test_wsgiapp.py
@@ -1,17 +1,17 @@
 import flask
 
 from .. import tservers
-from mitmproxy.builtins import wsgiapp
+from mitmproxy.addons import wsgiapp
 
-testapp = flask.Flask(__name__)
+tapp = flask.Flask(__name__)
 
 
-@testapp.route("/")
+@tapp.route("/")
 def hello():
     return "testapp"
 
 
-@testapp.route("/error")
+@tapp.route("/error")
 def error():
     raise ValueError("An exception...")
 
@@ -23,7 +23,7 @@ def errapp(environ, start_response):
 class TestApp(tservers.HTTPProxyTest):
     def addons(self):
         return [
-            wsgiapp.WSGIApp(testapp, "testapp", 80),
+            wsgiapp.WSGIApp(tapp, "testapp", 80),
             wsgiapp.WSGIApp(errapp, "errapp", 80)
         ]
 
diff --git a/test/mitmproxy/script/test_concurrent.py b/test/mitmproxy/script/test_concurrent.py
index bebd8dea..51c36abf 100644
--- a/test/mitmproxy/script/test_concurrent.py
+++ b/test/mitmproxy/script/test_concurrent.py
@@ -1,6 +1,6 @@
 from test.mitmproxy import tutils, mastertest
 from mitmproxy import controller
-from mitmproxy.builtins import script
+from mitmproxy.addons import script
 from mitmproxy import options
 from mitmproxy import proxy
 from mitmproxy import master
diff --git a/test/mitmproxy/test_addons.py b/test/mitmproxy/test_addonmanager.py
index dcf14398..7a50148e 100644
--- a/test/mitmproxy/test_addons.py
+++ b/test/mitmproxy/test_addonmanager.py
@@ -1,4 +1,4 @@
-from mitmproxy import addons
+from mitmproxy import addonmanager
 from mitmproxy import options
 from mitmproxy import master
 from mitmproxy import proxy
@@ -15,7 +15,7 @@ class TAddon:
 def test_simple():
     o = options.Options()
     m = master.Master(o, proxy.DummyServer(o))
-    a = addons.Addons(m)
+    a = addonmanager.AddonManager(m)
     a.add(TAddon("one"))
     assert a.get("one")
     assert not a.get("two")
diff --git a/test/mitmproxy/test_examples.py b/test/mitmproxy/test_examples.py
index ee5080e8..7551c1c8 100644
--- a/test/mitmproxy/test_examples.py
+++ b/test/mitmproxy/test_examples.py
@@ -5,7 +5,7 @@ import shlex
 from mitmproxy import options
 from mitmproxy import contentviews
 from mitmproxy import proxy
-from mitmproxy.builtins import script
+from mitmproxy.addons import script
 from mitmproxy import master
 
 import netlib.utils
diff --git a/test/mitmproxy/test_flow.py b/test/mitmproxy/test_flow.py
index 2b387f5c..86cd7d16 100644
--- a/test/mitmproxy/test_flow.py
+++ b/test/mitmproxy/test_flow.py
@@ -4,6 +4,7 @@ import io
 import netlib.utils
 from netlib.http import Headers
 from mitmproxy import flowfilter, flow, options
+from mitmproxy.addons import state
 from mitmproxy.contrib import tnetstring
 from mitmproxy.exceptions import FlowReadException, Kill
 from mitmproxy.models import Error
@@ -110,7 +111,7 @@ class TestHTTPFlow:
 
     def test_killall(self):
         srv = DummyServer(None)
-        s = flow.State()
+        s = state.State()
         fm = master.Master(None, srv)
         fm.addons.add(s)
 
@@ -190,7 +191,7 @@ class TestTCPFlow:
 class TestState:
 
     def test_backup(self):
-        c = flow.State()
+        c = state.State()
         f = tutils.tflow()
         c.add_flow(f)
         f.backup()
@@ -202,7 +203,7 @@ class TestState:
 
                 connect -> request -> response
         """
-        c = flow.State()
+        c = state.State()
         f = tutils.tflow()
         c.add_flow(f)
         assert f
@@ -226,13 +227,13 @@ class TestState:
         assert c.active_flow_count() == 0
 
     def test_err(self):
-        c = flow.State()
+        c = state.State()
         f = tutils.tflow()
         c.add_flow(f)
         f.error = Error("message")
         assert c.update_flow(f)
 
-        c = flow.State()
+        c = state.State()
         f = tutils.tflow()
         c.add_flow(f)
         c.set_view_filter("~e")
@@ -242,7 +243,7 @@ class TestState:
         assert c.view
 
     def test_set_view_filter(self):
-        c = flow.State()
+        c = state.State()
 
         f = tutils.tflow()
         assert len(c.view) == 0
@@ -270,7 +271,7 @@ class TestState:
         assert "Invalid" in c.set_view_filter("~")
 
     def test_set_intercept(self):
-        c = flow.State()
+        c = state.State()
         assert not c.set_intercept("~q")
         assert c.intercept_txt == "~q"
         assert "Invalid" in c.set_intercept("~")
@@ -293,7 +294,7 @@ class TestState:
         state.add_flow(f)
 
     def test_clear(self):
-        c = flow.State()
+        c = state.State()
         f = self._add_request(c)
         f.intercepted = True
 
@@ -301,7 +302,7 @@ class TestState:
         assert c.flow_count() == 0
 
     def test_dump_flows(self):
-        c = flow.State()
+        c = state.State()
         self._add_request(c)
         self._add_response(c)
         self._add_request(c)
@@ -317,7 +318,7 @@ class TestState:
         assert isinstance(c.flows[0], Flow)
 
     def test_accept_all(self):
-        c = flow.State()
+        c = state.State()
         self._add_request(c)
         self._add_response(c)
         self._add_request(c)
@@ -363,7 +364,7 @@ class TestSerialize:
 
     def test_load_flows(self):
         r = self._treader()
-        s = flow.State()
+        s = state.State()
         fm = master.Master(None, DummyServer())
         fm.addons.add(s)
         fm.load_flows(r)
@@ -371,7 +372,7 @@ class TestSerialize:
 
     def test_load_flows_reverse(self):
         r = self._treader()
-        s = flow.State()
+        s = state.State()
         opts = options.Options(
             mode="reverse",
             upstream_server="https://use-this-domain"
@@ -440,7 +441,7 @@ class TestFlowMaster:
         assert fm.create_request("GET", "http", "example.com", 80, "/")
 
     def test_all(self):
-        s = flow.State()
+        s = state.State()
         fm = master.Master(None, DummyServer())
         fm.addons.add(s)
         f = tutils.tflow(req=None)
diff --git a/test/mitmproxy/test_server.py b/test/mitmproxy/test_server.py
index 6679625b..7616b5a7 100644
--- a/test/mitmproxy/test_server.py
+++ b/test/mitmproxy/test_server.py
@@ -5,7 +5,7 @@ import time
 import netlib.tutils
 from mitmproxy import controller
 from mitmproxy import options
-from mitmproxy.builtins import script
+from mitmproxy.addons import script
 from mitmproxy.models import HTTPResponse, HTTPFlow
 from mitmproxy.proxy.config import HostMatcher, parse_server_spec
 from netlib import tcp, http, socks
diff --git a/test/mitmproxy/tools/benchtool.py b/test/mitmproxy/tools/benchtool.py
index bc68645c..9e2ab8ee 100644
--- a/test/mitmproxy/tools/benchtool.py
+++ b/test/mitmproxy/tools/benchtool.py
@@ -38,7 +38,7 @@ def main(profiler, clock_type, concurrency):
 
     if profiler == "yappi":
         yappi.set_clock_type(clock_type)
-        yappi.start(builtins=True)
+        yappi.start(addons=True)
 
     print("Start mitmdump...")
     mitmdump(["-k", "-q", "-S", "1024example"])
diff --git a/test/mitmproxy/tservers.py b/test/mitmproxy/tservers.py
index 254af2f0..1243bca0 100644
--- a/test/mitmproxy/tservers.py
+++ b/test/mitmproxy/tservers.py
@@ -7,7 +7,7 @@ import sys
 from mitmproxy.proxy.config import ProxyConfig
 from mitmproxy.proxy.server import ProxyServer
 from mitmproxy import master
-from mitmproxy.flow import state
+from mitmproxy.addons import state
 import pathod.test
 import pathod.pathoc
 from mitmproxy import controller, options
diff --git a/test/netlib/http/test_request.py b/test/netlib/http/test_request.py
index 87eb9c35..336dc86d 100644
--- a/test/netlib/http/test_request.py
+++ b/test/netlib/http/test_request.py
@@ -15,7 +15,7 @@ class TestRequestData:
 
 class TestRequestCore:
     """
-    Tests for builtins and the attributes that are directly proxied from the data structure
+    Tests for addons and the attributes that are directly proxied from the data structure
     """
     def test_repr(self):
         request = treq()
diff --git a/test/netlib/http/test_response.py b/test/netlib/http/test_response.py
index 0953f278..725f2b33 100644
--- a/test/netlib/http/test_response.py
+++ b/test/netlib/http/test_response.py
@@ -19,7 +19,7 @@ class TestResponseData:
 
 class TestResponseCore:
     """
-    Tests for builtins and the attributes that are directly proxied from the data structure
+    Tests for addons and the attributes that are directly proxied from the data structure
     """
     def test_repr(self):
         response = tresp()