aboutsummaryrefslogtreecommitdiffstats
path: root/test/tutils.py
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2013-01-04 14:19:32 +1300
committerAldo Cortesi <aldo@nullcube.com>2013-01-04 14:19:32 +1300
commit46ab6ed4912039e19c17cc4346bf562f2acdc8a9 (patch)
treebfaf607742c44e0771516f7f2b50596595885829 /test/tutils.py
parentf5e49ef598f46257cc783e52ef4223a3461f1d84 (diff)
downloadmitmproxy-46ab6ed4912039e19c17cc4346bf562f2acdc8a9.tar.gz
mitmproxy-46ab6ed4912039e19c17cc4346bf562f2acdc8a9.tar.bz2
mitmproxy-46ab6ed4912039e19c17cc4346bf562f2acdc8a9.zip
Minor cleanups of proxy request handling.
Diffstat (limited to 'test/tutils.py')
-rw-r--r--test/tutils.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/tutils.py b/test/tutils.py
index 0e661a4b..479482ac 100644
--- a/test/tutils.py
+++ b/test/tutils.py
@@ -4,7 +4,7 @@ from contextlib import contextmanager
from libmproxy import proxy, flow, controller, utils
from netlib import certutils
import human_curl as hurl
-import libpathod.test
+import libpathod.test, libpathod.pathoc
def treq(conn=None):
if not conn:
@@ -194,7 +194,6 @@ class ReverseProxTest(ProxTestBase):
return r
-
@contextmanager
def tmpdir(*args, **kwargs):
orig_workdir = os.getcwd()
@@ -244,5 +243,6 @@ def raises(exc, obj, *args, **kwargs):
)
)
raise AssertionError("No exception raised.")
+
test_data = utils.Data(__name__)