aboutsummaryrefslogtreecommitdiffstats
path: root/test/mitmproxy/test_server.py
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2016-10-20 11:42:55 +1300
committerAldo Cortesi <aldo@nullcube.com>2016-10-20 11:42:55 +1300
commit853e03a5e753354fad3a3fa5384ef3a09384ef43 (patch)
tree67435786604e0efaa45a49fcd17bda78fe680801 /test/mitmproxy/test_server.py
parent9491d8589a265be33a5d6fac92c1213fd5b719d4 (diff)
downloadmitmproxy-853e03a5e753354fad3a3fa5384ef3a09384ef43.tar.gz
mitmproxy-853e03a5e753354fad3a3fa5384ef3a09384ef43.tar.bz2
mitmproxy-853e03a5e753354fad3a3fa5384ef3a09384ef43.zip
netlib.tutils -> mitmproxy.test.tutils
There's a LOT more to be done refactoring our different conflicting test utils.
Diffstat (limited to 'test/mitmproxy/test_server.py')
-rw-r--r--test/mitmproxy/test_server.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/test/mitmproxy/test_server.py b/test/mitmproxy/test_server.py
index 79fd6f86..f7f13443 100644
--- a/test/mitmproxy/test_server.py
+++ b/test/mitmproxy/test_server.py
@@ -2,7 +2,7 @@ import os
import socket
import time
-import netlib.tutils
+import mitmproxy.test.tutils
from mitmproxy import controller
from mitmproxy import options
from mitmproxy.addons import script
@@ -16,7 +16,7 @@ from mitmproxy import exceptions
from netlib.http import authentication
from netlib.http import http1
from netlib.tcp import Address
-from netlib.tutils import raises
+from mitmproxy.test.tutils import raises
from pathod import pathoc
from pathod import pathod
@@ -794,7 +794,7 @@ class TestStreamRequest(tservers.HTTPProxyTest):
class MasterFakeResponse(tservers.TestMaster):
@controller.handler
def request(self, f):
- f.response = http.HTTPResponse.wrap(netlib.tutils.tresp())
+ f.response = http.HTTPResponse.wrap(mitmproxy.test.tutils.tresp())
class TestFakeResponse(tservers.HTTPProxyTest):
@@ -873,7 +873,7 @@ class MasterIncomplete(tservers.TestMaster):
@controller.handler
def request(self, f):
- resp = http.HTTPResponse.wrap(netlib.tutils.tresp())
+ resp = http.HTTPResponse.wrap(mitmproxy.test.tutils.tresp())
resp.content = None
f.response = resp