aboutsummaryrefslogtreecommitdiffstats
path: root/test/test_dump.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2014-03-09 21:51:24 +0100
committerMaximilian Hils <git@maximilianhils.com>2014-03-09 21:51:24 +0100
commit5598a8de82f28232fb4407911a8643dceacc9ebc (patch)
tree832c4db3c0b897ad6615761083a7735e18d45b44 /test/test_dump.py
parentfc4fe83eafc68ebb9763fa5cbee1ed7e16964c9c (diff)
downloadmitmproxy-5598a8de82f28232fb4407911a8643dceacc9ebc.tar.gz
mitmproxy-5598a8de82f28232fb4407911a8643dceacc9ebc.tar.bz2
mitmproxy-5598a8de82f28232fb4407911a8643dceacc9ebc.zip
finish proxy.py split up
Diffstat (limited to 'test/test_dump.py')
-rw-r--r--test/test_dump.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/test/test_dump.py b/test/test_dump.py
index c5c231fa..0f7d9bea 100644
--- a/test/test_dump.py
+++ b/test/test_dump.py
@@ -1,6 +1,7 @@
import os
from cStringIO import StringIO
-from libmproxy import dump, flow, proxy, prxy
+from libmproxy import dump, flow, proxy
+from libmproxy.proxy.primitives import Log
import tutils
import mock
@@ -21,13 +22,13 @@ def test_strfuncs():
class TestDumpMaster:
def _cycle(self, m, content):
req = tutils.treq(content=content)
- l = proxy.Log("connect")
+ l = Log("connect")
l.reply = mock.MagicMock()
m.handle_log(l)
cc = req.flow.client_conn
cc.reply = mock.MagicMock()
m.handle_clientconnect(cc)
- sc = prxy.connection.ServerConnection((req.get_host(), req.get_port()), None)
+ sc = proxy.connection.ServerConnection((req.get_host(), req.get_port()), None)
sc.reply = mock.MagicMock()
m.handle_serverconnection(sc)
m.handle_request(req)