diff options
| author | Aldo Cortesi <aldo@corte.si> | 2014-03-10 17:24:05 +1300 |
|---|---|---|
| committer | Aldo Cortesi <aldo@corte.si> | 2014-03-10 17:24:05 +1300 |
| commit | 554deee222fa4d2100b93becc4dd06f7342e3694 (patch) | |
| tree | 8acbf873630193e7bc34185f3a243e1aab408869 /test/tutils.py | |
| parent | 2e50b1073538730fc5bd6369e2cb8176874f2f03 (diff) | |
| parent | dd3aedca01a61f2fe33d009320f7fe656f1fc671 (diff) | |
| download | mitmproxy-554deee222fa4d2100b93becc4dd06f7342e3694.tar.gz mitmproxy-554deee222fa4d2100b93becc4dd06f7342e3694.tar.bz2 mitmproxy-554deee222fa4d2100b93becc4dd06f7342e3694.zip | |
Merge pull request #233 from mitmproxy/untangle_circular_dependencies
Untangle circular dependencies
Diffstat (limited to 'test/tutils.py')
| -rw-r--r-- | test/tutils.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/test/tutils.py b/test/tutils.py index b1bfc831..3f6592b0 100644 --- a/test/tutils.py +++ b/test/tutils.py @@ -1,7 +1,8 @@ import os, shutil, tempfile from contextlib import contextmanager -from libmproxy import flow, utils, controller, proxy +from libmproxy import flow, utils, controller from libmproxy.protocol import http +from libmproxy.proxy.connection import ClientConnection, ServerConnection import mock_urwid from libmproxy.console.flowview import FlowView from libmproxy.console import ConsoleState @@ -21,7 +22,7 @@ def SkipWindows(fn): def tclient_conn(): - c = proxy.ClientConnection._from_state(dict( + c = ClientConnection._from_state(dict( address=dict(address=("address", 22), use_ipv6=True), clientcert=None )) @@ -30,7 +31,7 @@ def tclient_conn(): def tserver_conn(): - c = proxy.ServerConnection._from_state(dict( + c = ServerConnection._from_state(dict( address=dict(address=("address", 22), use_ipv6=True), source_address=dict(address=("address", 22), use_ipv6=True), cert=None @@ -69,7 +70,7 @@ def tresp(req=None, content="message"): headers = flow.ODictCaseless() headers["header_response"] = ["svalue"] cert = certutils.SSLCert.from_der(file(test_data.path("data/dercert"), "rb").read()) - f.server_conn = proxy.ServerConnection._from_state(dict( + f.server_conn = ServerConnection._from_state(dict( address=dict(address=("address", 22), use_ipv6=True), source_address=None, cert=cert.to_pem())) |