aboutsummaryrefslogtreecommitdiffstats
path: root/test/pathod
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/pathod
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/pathod')
-rw-r--r--test/pathod/test_pathoc.py2
-rw-r--r--test/pathod/test_protocols_http2.py2
-rw-r--r--test/pathod/tutils.py2
3 files changed, 3 insertions, 3 deletions
diff --git a/test/pathod/test_pathoc.py b/test/pathod/test_pathoc.py
index d26eb15d..98dc9825 100644
--- a/test/pathod/test_pathoc.py
+++ b/test/pathod/test_pathoc.py
@@ -4,7 +4,7 @@ from mock import Mock
from netlib import http
from netlib import tcp
from netlib.http import http1
-from netlib.tutils import raises
+from mitmproxy.test.tutils import raises
from mitmproxy import exceptions
from pathod import pathoc, language
diff --git a/test/pathod/test_protocols_http2.py b/test/pathod/test_protocols_http2.py
index bb69bd10..a7303115 100644
--- a/test/pathod/test_protocols_http2.py
+++ b/test/pathod/test_protocols_http2.py
@@ -3,7 +3,7 @@ import codecs
import hyperframe
from netlib import tcp, http
-from netlib.tutils import raises
+from mitmproxy.test.tutils import raises
from netlib.http import http2
from mitmproxy import exceptions
diff --git a/test/pathod/tutils.py b/test/pathod/tutils.py
index 171d97a4..16dec187 100644
--- a/test/pathod/tutils.py
+++ b/test/pathod/tutils.py
@@ -8,7 +8,7 @@ import urllib
from mitmproxy.utils import data
from netlib import tcp
-from netlib import tutils
+from mitmproxy.test import tutils
from pathod import language
from pathod import pathoc