netlib.tutils -> mitmproxy.test.tutils

There's a LOT more to be done refactoring our different conflicting test utils.

14 files changed, 44 insertions, 42 deletions

diff --git a/test/netlib/http/http1/test_assemble.py b/test/netlib/http/http1/test_assemble.py
index d5a5e5fb..dac5fdad 100644
--- a/test/netlib/http/http1/test_assemble.py
+++ b/test/netlib/http/http1/test_assemble.py
@@ -5,7 +5,7 @@ from netlib.http.http1.assemble import (
     assemble_response_head, _assemble_request_line, _assemble_request_headers,
     _assemble_response_headers,
     assemble_body)
-from netlib.tutils import treq, raises, tresp
+from mitmproxy.test.tutils import treq, raises, tresp
 
 
 def test_assemble_request():
diff --git a/test/netlib/http/http1/test_read.py b/test/netlib/http/http1/test_read.py
index 9777e2e2..eb96968c 100644
--- a/test/netlib/http/http1/test_read.py
+++ b/test/netlib/http/http1/test_read.py
@@ -10,7 +10,7 @@ from netlib.http.http1.read import (
     _read_request_line, _parse_authority_form, _read_response_line, _check_http_version,
     _read_headers, _read_chunked, get_header_tokens
 )
-from netlib.tutils import treq, tresp, raises
+from mitmproxy.test.tutils import treq, tresp, raises
 
 
 def test_get_header_tokens():
diff --git a/test/netlib/http/test_authentication.py b/test/netlib/http/test_authentication.py
index 95d72447..5e04bbc5 100644
--- a/test/netlib/http/test_authentication.py
+++ b/test/netlib/http/test_authentication.py
@@ -1,6 +1,6 @@
 import binascii
 
-from netlib import tutils
+from mitmproxy.test import tutils
 from netlib.http import authentication, Headers
 
 
diff --git a/test/netlib/http/test_cookies.py b/test/netlib/http/test_cookies.py
index 80ffb0a6..ca10a69c 100644
--- a/test/netlib/http/test_cookies.py
+++ b/test/netlib/http/test_cookies.py
@@ -1,7 +1,7 @@
 import time
 
 from netlib.http import cookies
-from netlib.tutils import raises
+from mitmproxy.test.tutils import raises
 
 import mock
 
diff --git a/test/netlib/http/test_encoding.py b/test/netlib/http/test_encoding.py
index 681f9bfc..89600709 100644
--- a/test/netlib/http/test_encoding.py
+++ b/test/netlib/http/test_encoding.py
@@ -2,7 +2,7 @@ import mock
 import pytest
 
 from netlib.http import encoding
-from netlib import tutils
+from mitmproxy.test import tutils
 
 
 @pytest.mark.parametrize("encoder", [
diff --git a/test/netlib/http/test_headers.py b/test/netlib/http/test_headers.py
index 63f16897..cac77d57 100644
--- a/test/netlib/http/test_headers.py
+++ b/test/netlib/http/test_headers.py
@@ -1,7 +1,7 @@
 import collections
 
 from netlib.http.headers import Headers, parse_content_type, assemble_content_type
-from netlib.tutils import raises
+from mitmproxy.test.tutils import raises
 
 
 class TestHeaders:
diff --git a/test/netlib/http/test_message.py b/test/netlib/http/test_message.py
index 8374f8f6..2bc8824f 100644
--- a/test/netlib/http/test_message.py
+++ b/test/netlib/http/test_message.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
-from netlib.tutils import tresp
-from netlib import http, tutils
+from mitmproxy.test import tutils
+from netlib import http
 
 
 def _test_passthrough_attr(message, attr):
@@ -37,12 +37,12 @@ def _test_decoded_attr(message, attr):
 
 class TestMessageData:
     def test_eq_ne(self):
-        data = tresp(timestamp_start=42, timestamp_end=42).data
-        same = tresp(timestamp_start=42, timestamp_end=42).data
+        data = tutils.tresp(timestamp_start=42, timestamp_end=42).data
+        same = tutils.tresp(timestamp_start=42, timestamp_end=42).data
         assert data == same
         assert not data != same
 
-        other = tresp(content=b"foo").data
+        other = tutils.tresp(content=b"foo").data
         assert not data == other
         assert data != other
 
@@ -52,28 +52,28 @@ class TestMessageData:
 class TestMessage:
 
     def test_init(self):
-        resp = tresp()
+        resp = tutils.tresp()
         assert resp.data
 
     def test_eq_ne(self):
-        resp = tresp(timestamp_start=42, timestamp_end=42)
-        same = tresp(timestamp_start=42, timestamp_end=42)
+        resp = tutils.tresp(timestamp_start=42, timestamp_end=42)
+        same = tutils.tresp(timestamp_start=42, timestamp_end=42)
         assert resp == same
         assert not resp != same
 
-        other = tresp(timestamp_start=0, timestamp_end=0)
+        other = tutils.tresp(timestamp_start=0, timestamp_end=0)
         assert not resp == other
         assert resp != other
 
         assert resp != 0
 
     def test_serializable(self):
-        resp = tresp()
+        resp = tutils.tresp()
         resp2 = http.Response.from_state(resp.get_state())
         assert resp == resp2
 
     def test_content_length_update(self):
-        resp = tresp()
+        resp = tutils.tresp()
         resp.content = b"foo"
         assert resp.data.content == b"foo"
         assert resp.headers["content-length"] == "3"
@@ -85,19 +85,19 @@ class TestMessage:
         assert resp.headers["content-length"] == "0"
 
     def test_headers(self):
-        _test_passthrough_attr(tresp(), "headers")
+        _test_passthrough_attr(tutils.tresp(), "headers")
 
     def test_timestamp_start(self):
-        _test_passthrough_attr(tresp(), "timestamp_start")
+        _test_passthrough_attr(tutils.tresp(), "timestamp_start")
 
     def test_timestamp_end(self):
-        _test_passthrough_attr(tresp(), "timestamp_end")
+        _test_passthrough_attr(tutils.tresp(), "timestamp_end")
 
     def test_http_version(self):
-        _test_decoded_attr(tresp(), "http_version")
+        _test_decoded_attr(tutils.tresp(), "http_version")
 
     def test_replace(self):
-        r = tresp()
+        r = tutils.tresp()
         r.content = b"foofootoo"
         r.replace(b"foo", "gg")
         assert r.content == b"ggggtoo"
@@ -109,7 +109,7 @@ class TestMessage:
 
 class TestMessageContentEncoding:
     def test_simple(self):
-        r = tresp()
+        r = tutils.tresp()
         assert r.raw_content == b"message"
         assert "content-encoding" not in r.headers
         r.encode("gzip")
@@ -120,7 +120,7 @@ class TestMessageContentEncoding:
         assert r.raw_content != b"message"
 
     def test_modify(self):
-        r = tresp()
+        r = tutils.tresp()
         assert "content-encoding" not in r.headers
         r.encode("gzip")
 
@@ -133,7 +133,7 @@ class TestMessageContentEncoding:
             r.content = u"foo"
 
     def test_unknown_ce(self):
-        r = tresp()
+        r = tutils.tresp()
         r.headers["content-encoding"] = "zopfli"
         r.raw_content = b"foo"
         with tutils.raises(ValueError):
@@ -142,7 +142,7 @@ class TestMessageContentEncoding:
         assert r.get_content(strict=False) == b"foo"
 
     def test_cannot_decode(self):
-        r = tresp()
+        r = tutils.tresp()
         r.encode("gzip")
         r.raw_content = b"foo"
         with tutils.raises(ValueError):
@@ -160,7 +160,7 @@ class TestMessageContentEncoding:
         assert "content-encoding" not in r.headers
 
     def test_none(self):
-        r = tresp(content=None)
+        r = tutils.tresp(content=None)
         assert r.content is None
         r.content = b"foo"
         assert r.content is not None
@@ -168,7 +168,7 @@ class TestMessageContentEncoding:
         assert r.content is None
 
     def test_cannot_encode(self):
-        r = tresp()
+        r = tutils.tresp()
         r.encode("gzip")
         r.content = None
         assert r.headers["content-encoding"]
@@ -187,7 +187,7 @@ class TestMessageContentEncoding:
 
 class TestMessageText:
     def test_simple(self):
-        r = tresp(content=b'\xfc')
+        r = tutils.tresp(content=b'\xfc')
         assert r.raw_content == b"\xfc"
         assert r.content == b"\xfc"
         assert r.text == u"ü"
@@ -204,12 +204,12 @@ class TestMessageText:
         assert r.text == u"ü"
 
     def test_guess_json(self):
-        r = tresp(content=b'"\xc3\xbc"')
+        r = tutils.tresp(content=b'"\xc3\xbc"')
         r.headers["content-type"] = "application/json"
         assert r.text == u'"ü"'
 
     def test_none(self):
-        r = tresp(content=None)
+        r = tutils.tresp(content=None)
         assert r.text is None
         r.text = u"foo"
         assert r.text is not None
@@ -217,7 +217,7 @@ class TestMessageText:
         assert r.text is None
 
     def test_modify(self):
-        r = tresp()
+        r = tutils.tresp()
 
         r.text = u"ü"
         assert r.raw_content == b"\xfc"
@@ -228,7 +228,7 @@ class TestMessageText:
         assert r.headers["content-length"] == "2"
 
     def test_unknown_ce(self):
-        r = tresp()
+        r = tutils.tresp()
         r.headers["content-type"] = "text/html; charset=wtf"
         r.raw_content = b"foo"
         with tutils.raises(ValueError):
@@ -236,7 +236,7 @@ class TestMessageText:
         assert r.get_text(strict=False) == u"foo"
 
     def test_cannot_decode(self):
-        r = tresp()
+        r = tutils.tresp()
         r.headers["content-type"] = "text/html; charset=utf8"
         r.raw_content = b"\xFF"
         with tutils.raises(ValueError):
@@ -245,7 +245,7 @@ class TestMessageText:
         assert r.get_text(strict=False) == '\udcff'
 
     def test_cannot_encode(self):
-        r = tresp()
+        r = tutils.tresp()
         r.content = None
         assert "content-type" not in r.headers
         assert r.raw_content is None
diff --git a/test/netlib/http/test_request.py b/test/netlib/http/test_request.py
index 336dc86d..ecfc1ba6 100644
--- a/test/netlib/http/test_request.py
+++ b/test/netlib/http/test_request.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 from netlib.http import Headers
-from netlib.tutils import treq, raises
+from mitmproxy.test.tutils import treq, raises
 from .test_message import _test_decoded_attr, _test_passthrough_attr
 
 
diff --git a/test/netlib/http/test_response.py b/test/netlib/http/test_response.py
index 725f2b33..4a6fac62 100644
--- a/test/netlib/http/test_response.py
+++ b/test/netlib/http/test_response.py
@@ -5,7 +5,7 @@ import time
 from netlib.http import Headers
 from netlib.http import Response
 from netlib.http.cookies import CookieAttrs
-from netlib.tutils import raises, tresp
+from mitmproxy.test.tutils import raises, tresp
 from .test_message import _test_passthrough_attr, _test_decoded_attr
 
 
diff --git a/test/netlib/http/test_url.py b/test/netlib/http/test_url.py
index 631ed8a9..7cea6c58 100644
--- a/test/netlib/http/test_url.py
+++ b/test/netlib/http/test_url.py
@@ -1,4 +1,4 @@
-from netlib import tutils
+from mitmproxy.test import tutils
 from netlib.http import url
 
 
diff --git a/test/netlib/test_socks.py b/test/netlib/test_socks.py
index 17e08054..0603f34b 100644
--- a/test/netlib/test_socks.py
+++ b/test/netlib/test_socks.py
@@ -1,6 +1,8 @@
 import ipaddress
 from io import BytesIO
-from netlib import socks, tcp, tutils
+from netlib import socks
+from netlib import tcp
+from mitmproxy.test import tutils
 
 
 def test_client_greeting():
diff --git a/test/netlib/test_tcp.py b/test/netlib/test_tcp.py
index d61e1d91..594ee21c 100644
--- a/test/netlib/test_tcp.py
+++ b/test/netlib/test_tcp.py
@@ -11,7 +11,7 @@ from OpenSSL import SSL
 
 from mitmproxy import certs
 from netlib import tcp
-from netlib import tutils
+from mitmproxy.test import tutils
 from mitmproxy import exceptions
 
 from . import tservers
diff --git a/test/netlib/tservers.py b/test/netlib/tservers.py
index b344e25c..2fae8ba6 100644
--- a/test/netlib/tservers.py
+++ b/test/netlib/tservers.py
@@ -4,7 +4,7 @@ import io
 import OpenSSL
 
 from netlib import tcp
-from netlib import tutils
+from mitmproxy.test import tutils
 
 
 class _ServerThread(threading.Thread):
diff --git a/test/netlib/websockets/test_frame.py b/test/netlib/websockets/test_frame.py
index a039dcb1..3b7c9ed4 100644
--- a/test/netlib/websockets/test_frame.py
+++ b/test/netlib/websockets/test_frame.py
@@ -3,7 +3,7 @@ import codecs
 import pytest
 
 from netlib import websockets
-from netlib import tutils
+from mitmproxy.test import tutils
 
 
 class TestFrameHeader: