aboutsummaryrefslogtreecommitdiffstats
path: root/test/mitmproxy
diff options
context:
space:
mode:
Diffstat (limited to 'test/mitmproxy')
-rw-r--r--test/mitmproxy/addons/test_dumper.py10
-rw-r--r--test/mitmproxy/addons/test_serverplayback.py6
-rw-r--r--test/mitmproxy/addons/test_stickycookie.py2
-rw-r--r--test/mitmproxy/console/test_master.py12
-rw-r--r--test/mitmproxy/mastertest.py6
-rw-r--r--test/mitmproxy/protocol/test_http1.py2
-rw-r--r--test/mitmproxy/test_certs.py2
-rw-r--r--test/mitmproxy/test_contentview.py4
-rw-r--r--test/mitmproxy/test_controller.py2
-rw-r--r--test/mitmproxy/test_examples.py2
-rw-r--r--test/mitmproxy/test_flow.py28
-rw-r--r--test/mitmproxy/test_flow_export.py8
-rw-r--r--test/mitmproxy/test_optmanager.py2
-rw-r--r--test/mitmproxy/test_server.py8
-rw-r--r--test/mitmproxy/test_types_bidi.py2
-rw-r--r--test/mitmproxy/test_types_multidict.py2
-rw-r--r--test/mitmproxy/test_utils_human.py2
-rw-r--r--test/mitmproxy/test_utils_strutils.py2
-rw-r--r--test/mitmproxy/tutils.py8
19 files changed, 55 insertions, 55 deletions
diff --git a/test/mitmproxy/addons/test_dumper.py b/test/mitmproxy/addons/test_dumper.py
index e49f91bc..5f1b2dbd 100644
--- a/test/mitmproxy/addons/test_dumper.py
+++ b/test/mitmproxy/addons/test_dumper.py
@@ -7,7 +7,7 @@ from mitmproxy import exceptions
from mitmproxy.tools import dump
from mitmproxy import http
from mitmproxy import proxy
-import netlib.tutils
+import mitmproxy.test.tutils
import mock
@@ -38,11 +38,11 @@ class TestDumper(mastertest.MasterTest):
sio = io.StringIO()
d.configure(dump.Options(tfile = sio, flow_detail = 4), updated)
flow = tutils.tflow()
- flow.request = netlib.tutils.treq()
+ flow.request = mitmproxy.test.tutils.treq()
flow.request.stickycookie = True
flow.client_conn = mock.MagicMock()
flow.client_conn.address.host = "foo"
- flow.response = netlib.tutils.tresp(content=None)
+ flow.response = mitmproxy.test.tutils.tresp(content=None)
flow.response.is_replay = True
flow.response.status_code = 300
d.response(flow)
@@ -50,7 +50,7 @@ class TestDumper(mastertest.MasterTest):
sio = io.StringIO()
d.configure(dump.Options(tfile = sio, flow_detail = 4), updated)
- flow = tutils.tflow(resp=netlib.tutils.tresp(content=b"{"))
+ flow = tutils.tflow(resp=mitmproxy.test.tutils.tresp(content=b"{"))
flow.response.headers["content-type"] = "application/json"
flow.response.status_code = 400
d.response(flow)
@@ -60,7 +60,7 @@ class TestDumper(mastertest.MasterTest):
d.configure(dump.Options(tfile = sio), updated)
flow = tutils.tflow()
flow.request.content = None
- flow.response = http.HTTPResponse.wrap(netlib.tutils.tresp())
+ flow.response = http.HTTPResponse.wrap(mitmproxy.test.tutils.tresp())
flow.response.content = None
d.response(flow)
assert "content missing" in sio.getvalue()
diff --git a/test/mitmproxy/addons/test_serverplayback.py b/test/mitmproxy/addons/test_serverplayback.py
index 649b3c22..c8dd8704 100644
--- a/test/mitmproxy/addons/test_serverplayback.py
+++ b/test/mitmproxy/addons/test_serverplayback.py
@@ -1,6 +1,6 @@
from .. import tutils, mastertest
-import netlib.tutils
+import mitmproxy.test.tutils
from mitmproxy.addons import serverplayback
from mitmproxy import options
from mitmproxy import proxy
@@ -244,7 +244,7 @@ class TestServerPlayback:
m.addons.add(s)
f = tutils.tflow()
- f.response = netlib.tutils.tresp(content=f.request.content)
+ f.response = mitmproxy.test.tutils.tresp(content=f.request.content)
s.load([f, f])
tf = tutils.tflow()
@@ -273,7 +273,7 @@ class TestServerPlayback:
m.addons.add(s)
f = tutils.tflow()
- f.response = netlib.tutils.tresp(content=f.request.content)
+ f.response = mitmproxy.test.tutils.tresp(content=f.request.content)
s.load([f])
f = tutils.tflow()
diff --git a/test/mitmproxy/addons/test_stickycookie.py b/test/mitmproxy/addons/test_stickycookie.py
index 29c9e198..28c35b28 100644
--- a/test/mitmproxy/addons/test_stickycookie.py
+++ b/test/mitmproxy/addons/test_stickycookie.py
@@ -3,7 +3,7 @@ from mitmproxy.addons import stickycookie
from mitmproxy import master
from mitmproxy import options
from mitmproxy import proxy
-from netlib import tutils as ntutils
+from mitmproxy.test import tutils as ntutils
def test_domain_match():
diff --git a/test/mitmproxy/console/test_master.py b/test/mitmproxy/console/test_master.py
index da29a2b1..6d4bb7f9 100644
--- a/test/mitmproxy/console/test_master.py
+++ b/test/mitmproxy/console/test_master.py
@@ -1,6 +1,6 @@
import gc
-import netlib.tutils
+import mitmproxy.test.tutils
from mitmproxy.tools import console
from mitmproxy import proxy
from mitmproxy.tools.console import common
@@ -59,13 +59,13 @@ class TestConsoleState:
def _add_response(self, state):
f = self._add_request(state)
- f.response = netlib.tutils.tresp()
+ f.response = mitmproxy.test.tutils.tresp()
state.update_flow(f)
def test_add_response(self):
c = console.master.ConsoleState()
f = self._add_request(c)
- f.response = netlib.tutils.tresp()
+ f.response = mitmproxy.test.tutils.tresp()
c.focus = None
c.update_flow(f)
@@ -127,12 +127,12 @@ class TestMaster(mastertest.MasterTest):
def test_intercept(self):
"""regression test for https://github.com/mitmproxy/mitmproxy/issues/1605"""
m = self.mkmaster(intercept="~b bar")
- f = tutils.tflow(req=netlib.tutils.treq(content=b"foo"))
+ f = tutils.tflow(req=mitmproxy.test.tutils.treq(content=b"foo"))
m.request(f)
assert not m.state.flows[0].intercepted
- f = tutils.tflow(req=netlib.tutils.treq(content=b"bar"))
+ f = tutils.tflow(req=mitmproxy.test.tutils.treq(content=b"bar"))
m.request(f)
assert m.state.flows[1].intercepted
- f = tutils.tflow(resp=netlib.tutils.tresp(content=b"bar"))
+ f = tutils.tflow(resp=mitmproxy.test.tutils.tresp(content=b"bar"))
m.request(f)
assert m.state.flows[2].intercepted
diff --git a/test/mitmproxy/mastertest.py b/test/mitmproxy/mastertest.py
index 0b57c2d4..cdfb5ad5 100644
--- a/test/mitmproxy/mastertest.py
+++ b/test/mitmproxy/mastertest.py
@@ -1,7 +1,7 @@
import contextlib
from . import tutils
-import netlib.tutils
+import mitmproxy.test.tutils
from mitmproxy import master
from mitmproxy import io
@@ -17,13 +17,13 @@ class TestMaster:
class MasterTest:
def cycle(self, master, content):
- f = tutils.tflow(req=netlib.tutils.treq(content=content))
+ f = tutils.tflow(req=mitmproxy.test.tutils.treq(content=content))
master.clientconnect(f.client_conn)
master.serverconnect(f.server_conn)
master.request(f)
if not f.error:
f.response = http.HTTPResponse.wrap(
- netlib.tutils.tresp(content=content)
+ mitmproxy.test.tutils.tresp(content=content)
)
master.response(f)
master.clientdisconnect(f)
diff --git a/test/mitmproxy/protocol/test_http1.py b/test/mitmproxy/protocol/test_http1.py
index 8701c8e6..d18ff411 100644
--- a/test/mitmproxy/protocol/test_http1.py
+++ b/test/mitmproxy/protocol/test_http1.py
@@ -1,6 +1,6 @@
from netlib.http import http1
from netlib.tcp import TCPClient
-from netlib.tutils import treq
+from mitmproxy.test.tutils import treq
from .. import tutils, tservers
diff --git a/test/mitmproxy/test_certs.py b/test/mitmproxy/test_certs.py
index 35407fd6..2e706fa6 100644
--- a/test/mitmproxy/test_certs.py
+++ b/test/mitmproxy/test_certs.py
@@ -1,6 +1,6 @@
import os
from mitmproxy import certs
-from netlib import tutils
+from mitmproxy.test import tutils
# class TestDNTree:
# def test_simple(self):
diff --git a/test/mitmproxy/test_contentview.py b/test/mitmproxy/test_contentview.py
index f113e294..2c5e1c85 100644
--- a/test/mitmproxy/test_contentview.py
+++ b/test/mitmproxy/test_contentview.py
@@ -6,7 +6,7 @@ from mitmproxy.types import multidict
import mitmproxy.contentviews as cv
from . import tutils
-import netlib.tutils
+import mitmproxy.test.tutils
try:
import pyamf
@@ -232,7 +232,7 @@ def test_get_content_view():
def test_get_message_content_view():
- r = netlib.tutils.treq()
+ r = mitmproxy.test.tutils.treq()
desc, lines, err = cv.get_message_content_view(cv.get("Raw"), r)
assert desc == "Raw"
diff --git a/test/mitmproxy/test_controller.py b/test/mitmproxy/test_controller.py
index 071638a9..3bcb7013 100644
--- a/test/mitmproxy/test_controller.py
+++ b/test/mitmproxy/test_controller.py
@@ -9,7 +9,7 @@ import queue
from mitmproxy.exceptions import Kill, ControlException
from mitmproxy import proxy
from mitmproxy import master
-from netlib.tutils import raises
+from mitmproxy.test.tutils import raises
class TMsg:
diff --git a/test/mitmproxy/test_examples.py b/test/mitmproxy/test_examples.py
index 60d4a1a5..48193fe7 100644
--- a/test/mitmproxy/test_examples.py
+++ b/test/mitmproxy/test_examples.py
@@ -9,7 +9,7 @@ from mitmproxy.addons import script
from mitmproxy.utils import data
from mitmproxy import master
-from netlib import tutils as netutils
+from mitmproxy.test import tutils as netutils
from netlib.http import Headers
from netlib.http import cookies
diff --git a/test/mitmproxy/test_flow.py b/test/mitmproxy/test_flow.py
index 9b7e7395..14899be1 100644
--- a/test/mitmproxy/test_flow.py
+++ b/test/mitmproxy/test_flow.py
@@ -1,7 +1,7 @@
import mock
import io
-import netlib.tutils
+import mitmproxy.test.tutils
from netlib.http import Headers
import mitmproxy.io
from mitmproxy import flowfilter, options
@@ -59,7 +59,7 @@ class TestHTTPFlow:
def test_backup(self):
f = tutils.tflow()
- f.response = http.HTTPResponse.wrap(netlib.tutils.tresp())
+ f.response = http.HTTPResponse.wrap(mitmproxy.test.tutils.tresp())
f.request.content = b"foo"
assert not f.modified()
f.backup()
@@ -212,7 +212,7 @@ class TestState:
assert c.add_flow(newf)
assert c.active_flow_count() == 2
- f.response = http.HTTPResponse.wrap(netlib.tutils.tresp())
+ f.response = http.HTTPResponse.wrap(mitmproxy.test.tutils.tresp())
assert c.update_flow(f)
assert c.flow_count() == 2
assert c.active_flow_count() == 1
@@ -220,7 +220,7 @@ class TestState:
assert not c.update_flow(None)
assert c.active_flow_count() == 1
- newf.response = http.HTTPResponse.wrap(netlib.tutils.tresp())
+ newf.response = http.HTTPResponse.wrap(mitmproxy.test.tutils.tresp())
assert c.update_flow(newf)
assert c.active_flow_count() == 0
@@ -252,7 +252,7 @@ class TestState:
c.set_view_filter("~s")
assert c.filter_txt == "~s"
assert len(c.view) == 0
- f.response = http.HTTPResponse.wrap(netlib.tutils.tresp())
+ f.response = http.HTTPResponse.wrap(mitmproxy.test.tutils.tresp())
c.update_flow(f)
assert len(c.view) == 1
c.set_view_filter(None)
@@ -284,7 +284,7 @@ class TestState:
def _add_response(self, state):
f = tutils.tflow()
state.add_flow(f)
- f.response = http.HTTPResponse.wrap(netlib.tutils.tresp())
+ f.response = http.HTTPResponse.wrap(mitmproxy.test.tutils.tresp())
state.update_flow(f)
def _add_error(self, state):
@@ -444,11 +444,11 @@ class TestFlowMaster:
fm.addons.add(s)
f = tutils.tflow(req=None)
fm.clientconnect(f.client_conn)
- f.request = http.HTTPRequest.wrap(netlib.tutils.treq())
+ f.request = http.HTTPRequest.wrap(mitmproxy.test.tutils.treq())
fm.request(f)
assert s.flow_count() == 1
- f.response = http.HTTPResponse.wrap(netlib.tutils.tresp())
+ f.response = http.HTTPResponse.wrap(mitmproxy.test.tutils.tresp())
fm.response(f)
assert s.flow_count() == 1
@@ -473,7 +473,7 @@ class TestRequest:
assert r.get_state() == r2.get_state()
def test_get_url(self):
- r = http.HTTPRequest.wrap(netlib.tutils.treq())
+ r = http.HTTPRequest.wrap(mitmproxy.test.tutils.treq())
assert r.url == "http://address:22/path"
@@ -494,7 +494,7 @@ class TestRequest:
assert r.pretty_url == "https://foo.com:22/path"
def test_replace(self):
- r = http.HTTPRequest.wrap(netlib.tutils.treq())
+ r = http.HTTPRequest.wrap(mitmproxy.test.tutils.treq())
r.path = "path/foo"
r.headers["Foo"] = "fOo"
r.content = b"afoob"
@@ -504,7 +504,7 @@ class TestRequest:
assert r.headers["boo"] == "boo"
def test_constrain_encoding(self):
- r = http.HTTPRequest.wrap(netlib.tutils.treq())
+ r = http.HTTPRequest.wrap(mitmproxy.test.tutils.treq())
r.headers["accept-encoding"] = "gzip, oink"
r.constrain_encoding()
assert "oink" not in r.headers["accept-encoding"]
@@ -514,7 +514,7 @@ class TestRequest:
assert "oink" not in r.headers["accept-encoding"]
def test_get_content_type(self):
- resp = http.HTTPResponse.wrap(netlib.tutils.tresp())
+ resp = http.HTTPResponse.wrap(mitmproxy.test.tutils.tresp())
resp.headers = Headers(content_type="text/plain")
assert resp.headers["content-type"] == "text/plain"
@@ -528,7 +528,7 @@ class TestResponse:
assert resp2.get_state() == resp.get_state()
def test_replace(self):
- r = http.HTTPResponse.wrap(netlib.tutils.tresp())
+ r = http.HTTPResponse.wrap(mitmproxy.test.tutils.tresp())
r.headers["Foo"] = "fOo"
r.content = b"afoob"
assert r.replace("foo(?i)", "boo") == 3
@@ -536,7 +536,7 @@ class TestResponse:
assert r.headers["boo"] == "boo"
def test_get_content_type(self):
- resp = http.HTTPResponse.wrap(netlib.tutils.tresp())
+ resp = http.HTTPResponse.wrap(mitmproxy.test.tutils.tresp())
resp.headers = Headers(content_type="text/plain")
assert resp.headers["content-type"] == "text/plain"
diff --git a/test/mitmproxy/test_flow_export.py b/test/mitmproxy/test_flow_export.py
index aafd5a1c..8ef2b7ee 100644
--- a/test/mitmproxy/test_flow_export.py
+++ b/test/mitmproxy/test_flow_export.py
@@ -1,6 +1,6 @@
import re
-import netlib.tutils
+import mitmproxy.test.tutils
from netlib.http import Headers
from mitmproxy import export # heh
from . import tutils
@@ -20,15 +20,15 @@ def python_equals(testdata, text):
def req_get():
- return netlib.tutils.treq(method=b'GET', content=b'', path=b"/path?a=foo&a=bar&b=baz")
+ return mitmproxy.test.tutils.treq(method=b'GET', content=b'', path=b"/path?a=foo&a=bar&b=baz")
def req_post():
- return netlib.tutils.treq(method=b'POST', headers=())
+ return mitmproxy.test.tutils.treq(method=b'POST', headers=())
def req_patch():
- return netlib.tutils.treq(method=b'PATCH', path=b"/path?query=param")
+ return mitmproxy.test.tutils.treq(method=b'PATCH', path=b"/path?query=param")
class TestExportCurlCommand:
diff --git a/test/mitmproxy/test_optmanager.py b/test/mitmproxy/test_optmanager.py
index 1d677bd3..3c845707 100644
--- a/test/mitmproxy/test_optmanager.py
+++ b/test/mitmproxy/test_optmanager.py
@@ -2,7 +2,7 @@ import copy
from mitmproxy import optmanager
from mitmproxy import exceptions
-from netlib import tutils
+from mitmproxy.test import tutils
class TO(optmanager.OptManager):
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
diff --git a/test/mitmproxy/test_types_bidi.py b/test/mitmproxy/test_types_bidi.py
index a012c568..0494ac9d 100644
--- a/test/mitmproxy/test_types_bidi.py
+++ b/test/mitmproxy/test_types_bidi.py
@@ -1,5 +1,5 @@
from mitmproxy.types import bidi
-from netlib import tutils
+from mitmproxy.test import tutils
def test_bidi():
diff --git a/test/mitmproxy/test_types_multidict.py b/test/mitmproxy/test_types_multidict.py
index ada33bf7..d566905c 100644
--- a/test/mitmproxy/test_types_multidict.py
+++ b/test/mitmproxy/test_types_multidict.py
@@ -1,4 +1,4 @@
-from netlib import tutils
+from mitmproxy.test import tutils
from mitmproxy.types import multidict
diff --git a/test/mitmproxy/test_utils_human.py b/test/mitmproxy/test_utils_human.py
index 08609887..443c8f66 100644
--- a/test/mitmproxy/test_utils_human.py
+++ b/test/mitmproxy/test_utils_human.py
@@ -1,6 +1,6 @@
import time
from mitmproxy.utils import human
-from netlib import tutils
+from mitmproxy.test import tutils
def test_format_timestamp():
diff --git a/test/mitmproxy/test_utils_strutils.py b/test/mitmproxy/test_utils_strutils.py
index 2843688f..d4c2883c 100644
--- a/test/mitmproxy/test_utils_strutils.py
+++ b/test/mitmproxy/test_utils_strutils.py
@@ -1,5 +1,5 @@
from mitmproxy.utils import strutils
-from netlib import tutils
+from mitmproxy.test import tutils
def test_always_bytes():
diff --git a/test/mitmproxy/tutils.py b/test/mitmproxy/tutils.py
index aa70c0e8..c83223f6 100644
--- a/test/mitmproxy/tutils.py
+++ b/test/mitmproxy/tutils.py
@@ -9,7 +9,7 @@ from unittest.case import SkipTest
import io
-import netlib.tutils
+import mitmproxy.test.tutils
from mitmproxy import controller
from mitmproxy import connections
from mitmproxy import flow
@@ -102,9 +102,9 @@ def tflow(client_conn=True, server_conn=True, req=True, resp=None, err=None):
if server_conn is True:
server_conn = tserver_conn()
if req is True:
- req = netlib.tutils.treq()
+ req = mitmproxy.test.tutils.treq()
if resp is True:
- resp = netlib.tutils.tresp()
+ resp = mitmproxy.test.tutils.tresp()
if err is True:
err = terr()
@@ -197,7 +197,7 @@ class MockParser(argparse.ArgumentParser):
raise Exception(message)
-raises = netlib.tutils.raises
+raises = mitmproxy.test.tutils.raises
@contextmanager
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-26 18:01:30 +0000