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 | |
| 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')
| -rw-r--r-- | test/test_proxy.py | 7 | ||||
| -rw-r--r-- | test/tservers.py | 7 |
2 files changed, 5 insertions, 9 deletions
diff --git a/test/test_proxy.py b/test/test_proxy.py index d13c7ba9..5f1b83f6 100644 --- a/test/test_proxy.py +++ b/test/test_proxy.py @@ -91,10 +91,6 @@ class TestProcessProxyOptions: self.assert_err("expected one argument", "-U") self.assert_err("Invalid server specification", "-U", "upstream") - self.assert_noerr("--destination-server", "http://localhost") - self.assert_err("expected one argument", "--destination-server") - self.assert_err("Invalid server specification", "--destination-server", "manual") - self.assert_err("mutually exclusive", "-R", "http://localhost", "-T") def test_client_certs(self): @@ -144,7 +140,8 @@ class TestDummyServer: class TestConnectionHandler: def test_fatal_error(self): - config = dict(get_upstream_server=mock.Mock(side_effect=RuntimeError)) + config = mock.Mock() + config.mode.get_upstream_server.side_effect = RuntimeError c = ConnectionHandler(config, mock.MagicMock(), ("127.0.0.1", 8080), None, mock.MagicMock(), None) with tutils.capture_stderr(c.handle) as output: assert "mitmproxy has crashed" in output 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): |