diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-08-30 01:21:58 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-08-30 01:21:58 +0200 |
| commit | dd7f50d64bef38fa67b4cace91913d03691dde26 (patch) | |
| tree | c183aa1f286ec191a094713d1f697f2fa54ab385 /test | |
| parent | 100ea27c30d89b895a02a1b128edc5472ab84b3e (diff) | |
| download | mitmproxy-dd7f50d64bef38fa67b4cace91913d03691dde26.tar.gz mitmproxy-dd7f50d64bef38fa67b4cace91913d03691dde26.tar.bz2 mitmproxy-dd7f50d64bef38fa67b4cace91913d03691dde26.zip | |
restructure code, remove cruft
Diffstat (limited to 'test')
| -rw-r--r-- | test/test_dump.py | 4 | ||||
| -rw-r--r-- | test/test_proxy.py | 22 | ||||
| -rw-r--r-- | test/tservers.py | 1 |
3 files changed, 10 insertions, 17 deletions
diff --git a/test/test_dump.py b/test/test_dump.py index b3d724a5..b05f6a0f 100644 --- a/test/test_dump.py +++ b/test/test_dump.py @@ -5,8 +5,8 @@ import netlib.tutils from netlib.http.semantics import CONTENT_MISSING from libmproxy import dump, flow -from libmproxy.protocol import http, http_wrappers -from libmproxy.proxy.primitives import Log +from libmproxy.protocol import http_wrappers +from libmproxy.proxy import Log import tutils import mock diff --git a/test/test_proxy.py b/test/test_proxy.py index fac4a4f4..301ce2ca 100644 --- a/test/test_proxy.py +++ b/test/test_proxy.py @@ -1,8 +1,8 @@ from libmproxy import cmdline -from libmproxy.proxy import ProxyConfig, process_proxy_options +from libmproxy.proxy import ProxyConfig +from libmproxy.proxy.config import process_proxy_options from libmproxy.proxy.connection import ServerConnection -from libmproxy.proxy.primitives import ProxyError -from libmproxy.proxy.server import DummyServer, ProxyServer, ConnectionHandler2 +from libmproxy.proxy.server import DummyServer, ProxyServer, ConnectionHandler import tutils from libpathod import test from netlib import http, tcp @@ -11,11 +11,6 @@ import mock from OpenSSL import SSL -def test_proxy_error(): - p = ProxyError(111, "msg") - assert str(p) - - class TestServerConnection: def setUp(self): self.d = test.Daemon() @@ -177,12 +172,11 @@ class TestConnectionHandler: root_layer = mock.Mock() root_layer.side_effect = RuntimeError config.mode.return_value = root_layer - c = ConnectionHandler2( - config, + c = ConnectionHandler( mock.MagicMock(), - ("127.0.0.1", - 8080), - None, - mock.MagicMock()) + ("127.0.0.1", 8080), + config, + mock.MagicMock() + ) 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 dfd3f627..c5256e53 100644 --- a/test/tservers.py +++ b/test/tservers.py @@ -7,7 +7,6 @@ import mock from libmproxy.proxy.config import ProxyConfig from libmproxy.proxy.server import ProxyServer -from libmproxy.proxy.primitives import TransparentProxyMode import libpathod.test import libpathod.pathoc from libmproxy import flow, controller |