diff options
author | Maximilian Hils <git@maximilianhils.com> | 2014-09-08 14:32:42 +0200 |
---|---|---|
committer | Maximilian Hils <git@maximilianhils.com> | 2014-09-08 14:32:42 +0200 |
commit | d06b4bfa4e4cc51e903b49e246d7771726a3e3a4 (patch) | |
tree | 23b215550d09202b987540485c8bbea25ee96f46 /test/tservers.py | |
parent | 6dbe431c5e680d1c7f693a4c7bb7f3f65314c5c6 (diff) | |
download | mitmproxy-d06b4bfa4e4cc51e903b49e246d7771726a3e3a4.tar.gz mitmproxy-d06b4bfa4e4cc51e903b49e246d7771726a3e3a4.tar.bz2 mitmproxy-d06b4bfa4e4cc51e903b49e246d7771726a3e3a4.zip |
remove proxy mode abstraction: always be clear which mode we are in
Diffstat (limited to 'test/tservers.py')
-rw-r--r-- | test/tservers.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/test/tservers.py b/test/tservers.py index 8a2e72a4..009a3c92 100644 --- a/test/tservers.py +++ b/test/tservers.py @@ -6,7 +6,7 @@ import mock from libmproxy.proxy.config import ProxyConfig from libmproxy.proxy.server import ProxyServer -from libmproxy.proxy.primitives import TransparentUpstreamServerResolver +from libmproxy.proxy.primitives import TransparentProxyMode import libpathod.test, libpathod.pathoc from libmproxy import flow, controller from libmproxy.cmdline import APP_HOST, APP_PORT @@ -184,7 +184,7 @@ class TransparentProxTest(ProxTestBase): ports = [cls.server.port, cls.server2.port] else: ports = [] - cls.config.get_upstream_server = TransparentUpstreamServerResolver(cls.resolver(cls.server.port), ports) + cls.config.mode = TransparentProxyMode(cls.resolver(cls.server.port), ports) @classmethod def get_proxy_config(cls): @@ -224,8 +224,7 @@ class ReverseProxTest(ProxTestBase): "127.0.0.1", cls.server.port ) - d["http_form_in"] = "relative" - d["http_form_out"] = "relative" + d["mode"] = "reverse" return d def pathoc(self, sni=None): |