aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Kriechbaumer <thomas@kriechbaumer.name>2016-09-01 10:06:51 +0200
committerThomas Kriechbaumer <thomas@kriechbaumer.name>2016-09-01 10:12:13 +0200
commit0d0c2c788df4b60e951e6fcc13b479de8cec22c1 (patch)
treed469bbd0dd5b1966591a332bf2094d4389100219
parent823d8a5da89755d9f9d85f16434ddad26fd0ac6d (diff)
downloadmitmproxy-0d0c2c788df4b60e951e6fcc13b479de8cec22c1.tar.gz
mitmproxy-0d0c2c788df4b60e951e6fcc13b479de8cec22c1.tar.bz2
mitmproxy-0d0c2c788df4b60e951e6fcc13b479de8cec22c1.zip
cleanup tests
-rw-r--r--test/mitmproxy/protocol/__init__.py0
-rw-r--r--test/mitmproxy/protocol/test_http1.py (renamed from test/mitmproxy/test_protocol_http1.py)4
-rw-r--r--test/mitmproxy/protocol/test_http2.py (renamed from test/mitmproxy/test_protocol_http2.py)4
-rw-r--r--test/mitmproxy/protocol/test_websockets.py2
4 files changed, 7 insertions, 3 deletions
diff --git a/test/mitmproxy/protocol/__init__.py b/test/mitmproxy/protocol/__init__.py
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/test/mitmproxy/protocol/__init__.py
diff --git a/test/mitmproxy/test_protocol_http1.py b/test/mitmproxy/protocol/test_http1.py
index cf7bd598..7d04c56b 100644
--- a/test/mitmproxy/test_protocol_http1.py
+++ b/test/mitmproxy/protocol/test_http1.py
@@ -1,7 +1,9 @@
+from __future__ import (absolute_import, print_function, division)
+
from netlib.http import http1
from netlib.tcp import TCPClient
from netlib.tutils import treq
-from . import tutils, tservers
+from .. import tutils, tservers
class TestHTTPFlow(object):
diff --git a/test/mitmproxy/test_protocol_http2.py b/test/mitmproxy/protocol/test_http2.py
index 873c89c3..1eabebf1 100644
--- a/test/mitmproxy/test_protocol_http2.py
+++ b/test/mitmproxy/protocol/test_http2.py
@@ -13,11 +13,11 @@ from mitmproxy import options
from mitmproxy.proxy.config import ProxyConfig
import netlib
-from ..netlib import tservers as netlib_tservers
+from ...netlib import tservers as netlib_tservers
from netlib.exceptions import HttpException
from netlib.http.http2 import framereader
-from . import tservers
+from .. import tservers
import logging
logging.getLogger("hyper.packages.hpack.hpack").setLevel(logging.WARNING)
diff --git a/test/mitmproxy/protocol/test_websockets.py b/test/mitmproxy/protocol/test_websockets.py
index cc478c0b..e7e2684f 100644
--- a/test/mitmproxy/protocol/test_websockets.py
+++ b/test/mitmproxy/protocol/test_websockets.py
@@ -1,3 +1,5 @@
+from __future__ import absolute_import, print_function, division
+
import pytest
import os
import tempfile