aboutsummaryrefslogtreecommitdiffstats
path: root/test/test_flow.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2014-03-09 21:13:08 +0100
committerMaximilian Hils <git@maximilianhils.com>2014-03-09 21:13:08 +0100
commitfc4fe83eafc68ebb9763fa5cbee1ed7e16964c9c (patch)
treebffc95a421a5b885efd16cd77af7c4e1ad7d023d /test/test_flow.py
parent2e50b1073538730fc5bd6369e2cb8176874f2f03 (diff)
downloadmitmproxy-fc4fe83eafc68ebb9763fa5cbee1ed7e16964c9c.tar.gz
mitmproxy-fc4fe83eafc68ebb9763fa5cbee1ed7e16964c9c.tar.bz2
mitmproxy-fc4fe83eafc68ebb9763fa5cbee1ed7e16964c9c.zip
split up proxy.py
Diffstat (limited to 'test/test_flow.py')
-rw-r--r--test/test_flow.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/test/test_flow.py b/test/test_flow.py
index fbead1ca..c7e39f73 100644
--- a/test/test_flow.py
+++ b/test/test_flow.py
@@ -4,6 +4,7 @@ import email.utils
from libmproxy import filt, protocol, controller, utils, tnetstring, proxy, flow
from libmproxy.protocol.primitives import Error, Flow
from libmproxy.protocol.http import decoded
+from libmproxy.prxy.connection import ClientConnection, ServerConnection
from netlib import tcp
import tutils
@@ -586,7 +587,7 @@ class TestFlowMaster:
req = tutils.treq()
fm.handle_clientconnect(req.flow.client_conn)
assert fm.scripts[0].ns["log"][-1] == "clientconnect"
- sc = proxy.ServerConnection((req.get_host(), req.get_port()), None)
+ sc = ServerConnection((req.get_host(), req.get_port()), None)
sc.reply = controller.DummyReply()
fm.handle_serverconnection(sc)
assert fm.scripts[0].ns["log"][-1] == "serverconnect"
@@ -1159,7 +1160,7 @@ class TestClientConnection:
def test_state(self):
c = tutils.tclient_conn()
- assert proxy.ClientConnection._from_state(c._get_state()) == c
+ assert ClientConnection._from_state(c._get_state()) == c
c2 = tutils.tclient_conn()
c2.address.address = (c2.address.host, 4242)