diff options
Diffstat (limited to 'test')
-rw-r--r-- | test/mitmproxy/test_proxy.py | 2 | ||||
-rw-r--r-- | test/mitmproxy/test_server.py | 2 | ||||
-rw-r--r-- | test/mitmproxy/tservers.py | 18 | ||||
-rw-r--r-- | test/pathod/test_app.py | 2 | ||||
-rw-r--r-- | test/pathod/test_language_actions.py | 4 | ||||
-rw-r--r-- | test/pathod/test_language_base.py | 4 | ||||
-rw-r--r-- | test/pathod/test_language_generators.py | 2 | ||||
-rw-r--r-- | test/pathod/test_language_http.py | 4 | ||||
-rw-r--r-- | test/pathod/test_language_http2.py | 4 | ||||
-rw-r--r-- | test/pathod/test_language_websocket.py | 4 | ||||
-rw-r--r-- | test/pathod/test_language_writer.py | 4 | ||||
-rw-r--r-- | test/pathod/test_log.py | 2 | ||||
-rw-r--r-- | test/pathod/test_pathoc.py | 2 | ||||
-rw-r--r-- | test/pathod/test_pathoc_cmdline.py | 2 | ||||
-rw-r--r-- | test/pathod/test_pathod.py | 2 | ||||
-rw-r--r-- | test/pathod/test_pathod_cmdline.py | 2 | ||||
-rw-r--r-- | test/pathod/test_test.py | 2 | ||||
-rw-r--r-- | test/pathod/test_utils.py | 2 | ||||
-rw-r--r-- | test/pathod/tutils.py | 2 |
19 files changed, 33 insertions, 33 deletions
diff --git a/test/mitmproxy/test_proxy.py b/test/mitmproxy/test_proxy.py index 9c4a6604..34b75b62 100644 --- a/test/mitmproxy/test_proxy.py +++ b/test/mitmproxy/test_proxy.py @@ -8,7 +8,7 @@ from mitmproxy.proxy.config import process_proxy_options from mitmproxy.models.connections import ServerConnection from mitmproxy.proxy.server import DummyServer, ProxyServer, ConnectionHandler from netlib.exceptions import TcpDisconnect -from libpathod import test +from pathod import test from netlib.http import http1 from . import tutils diff --git a/test/mitmproxy/test_server.py b/test/mitmproxy/test_server.py index 3d65659f..6d023b57 100644 --- a/test/mitmproxy/test_server.py +++ b/test/mitmproxy/test_server.py @@ -10,7 +10,7 @@ from netlib import tcp, http, socks from netlib.certutils import SSLCert from netlib.http import authentication, CONTENT_MISSING, http1 from netlib.tutils import raises -from libpathod import pathoc, pathod +from pathod import pathoc, pathod from mitmproxy.proxy.config import HostMatcher from mitmproxy.protocol import Kill diff --git a/test/mitmproxy/tservers.py b/test/mitmproxy/tservers.py index df4a2f2d..8ef554f8 100644 --- a/test/mitmproxy/tservers.py +++ b/test/mitmproxy/tservers.py @@ -6,8 +6,8 @@ import mock from mitmproxy.proxy.config import ProxyConfig from mitmproxy.proxy.server import ProxyServer -import libpathod.test -import libpathod.pathoc +import pathod.test +import pathod.pathoc from mitmproxy import flow, controller from mitmproxy.cmdline import APP_HOST, APP_PORT @@ -89,10 +89,10 @@ class ProxTestBase(object): @classmethod def setup_class(cls): - cls.server = libpathod.test.Daemon( + cls.server = pathod.test.Daemon( ssl=cls.ssl, ssloptions=cls.ssloptions) - cls.server2 = libpathod.test.Daemon( + cls.server2 = pathod.test.Daemon( ssl=cls.ssl, ssloptions=cls.ssloptions) @@ -135,13 +135,13 @@ class ProxTestBase(object): class HTTPProxTest(ProxTestBase): def pathoc_raw(self): - return libpathod.pathoc.Pathoc(("127.0.0.1", self.proxy.port), fp=None) + return pathod.pathoc.Pathoc(("127.0.0.1", self.proxy.port), fp=None) def pathoc(self, sni=None): """ Returns a connected Pathoc instance. """ - p = libpathod.pathoc.Pathoc( + p = pathod.pathoc.Pathoc( ("localhost", self.proxy.port), ssl=self.ssl, sni=sni, fp=None ) if self.ssl: @@ -164,7 +164,7 @@ class HTTPProxTest(ProxTestBase): def app(self, page): if self.ssl: - p = libpathod.pathoc.Pathoc( + p = pathod.pathoc.Pathoc( ("127.0.0.1", self.proxy.port), True, fp=None ) p.connect((APP_HOST, APP_PORT)) @@ -224,7 +224,7 @@ class TransparentProxTest(ProxTestBase): """ Returns a connected Pathoc instance. """ - p = libpathod.pathoc.Pathoc( + p = pathod.pathoc.Pathoc( ("localhost", self.proxy.port), ssl=self.ssl, sni=sni, fp=None ) p.connect() @@ -248,7 +248,7 @@ class ReverseProxTest(ProxTestBase): """ Returns a connected Pathoc instance. """ - p = libpathod.pathoc.Pathoc( + p = pathod.pathoc.Pathoc( ("localhost", self.proxy.port), ssl=self.ssl, sni=sni, fp=None ) p.connect() diff --git a/test/pathod/test_app.py b/test/pathod/test_app.py index 4536db8e..ac89c44c 100644 --- a/test/pathod/test_app.py +++ b/test/pathod/test_app.py @@ -21,7 +21,7 @@ class TestApp(tutils.DaemonTests): assert self.getpath("/docs/pathod").status_code == 200 assert self.getpath("/docs/pathoc").status_code == 200 assert self.getpath("/docs/language").status_code == 200 - assert self.getpath("/docs/libpathod").status_code == 200 + assert self.getpath("/docs/pathod").status_code == 200 assert self.getpath("/docs/test").status_code == 200 def test_log(self): diff --git a/test/pathod/test_language_actions.py b/test/pathod/test_language_actions.py index 755f0d85..1c404714 100644 --- a/test/pathod/test_language_actions.py +++ b/test/pathod/test_language_actions.py @@ -1,7 +1,7 @@ import cStringIO -from libpathod.language import actions -from libpathod import language +from pathod.language import actions +from pathod import language def parse_request(s): diff --git a/test/pathod/test_language_base.py b/test/pathod/test_language_base.py index b18ee5b2..64d4af1f 100644 --- a/test/pathod/test_language_base.py +++ b/test/pathod/test_language_base.py @@ -1,6 +1,6 @@ import os -from libpathod import language -from libpathod.language import base, exceptions +from pathod import language +from pathod.language import base, exceptions import tutils diff --git a/test/pathod/test_language_generators.py b/test/pathod/test_language_generators.py index 945560c3..0fceae85 100644 --- a/test/pathod/test_language_generators.py +++ b/test/pathod/test_language_generators.py @@ -1,6 +1,6 @@ import os -from libpathod.language import generators +from pathod.language import generators import tutils diff --git a/test/pathod/test_language_http.py b/test/pathod/test_language_http.py index 26bb6a45..fd60c9fd 100644 --- a/test/pathod/test_language_http.py +++ b/test/pathod/test_language_http.py @@ -1,7 +1,7 @@ import cStringIO -from libpathod import language -from libpathod.language import http, base +from pathod import language +from pathod.language import http, base import tutils diff --git a/test/pathod/test_language_http2.py b/test/pathod/test_language_http2.py index 9be49452..8e9f188c 100644 --- a/test/pathod/test_language_http2.py +++ b/test/pathod/test_language_http2.py @@ -4,8 +4,8 @@ import netlib from netlib import tcp from netlib.http import user_agents -from libpathod import language -from libpathod.language import http2, base +from pathod import language +from pathod.language import http2, base import tutils diff --git a/test/pathod/test_language_websocket.py b/test/pathod/test_language_websocket.py index d98fd33e..f1105dfe 100644 --- a/test/pathod/test_language_websocket.py +++ b/test/pathod/test_language_websocket.py @@ -1,6 +1,6 @@ -from libpathod import language -from libpathod.language import websockets +from pathod import language +from pathod.language import websockets import netlib.websockets import tutils diff --git a/test/pathod/test_language_writer.py b/test/pathod/test_language_writer.py index 1a532903..1a4ac954 100644 --- a/test/pathod/test_language_writer.py +++ b/test/pathod/test_language_writer.py @@ -1,7 +1,7 @@ import cStringIO -from libpathod import language -from libpathod.language import writer +from pathod import language +from pathod.language import writer def test_send_chunk(): diff --git a/test/pathod/test_log.py b/test/pathod/test_log.py index 8f38c040..d91b8bb1 100644 --- a/test/pathod/test_log.py +++ b/test/pathod/test_log.py @@ -1,5 +1,5 @@ import StringIO -from libpathod import log +from pathod import log from netlib.exceptions import TcpDisconnect import netlib.tcp diff --git a/test/pathod/test_pathoc.py b/test/pathod/test_pathoc.py index 7c912773..23edd1d1 100644 --- a/test/pathod/test_pathoc.py +++ b/test/pathod/test_pathoc.py @@ -9,7 +9,7 @@ from netlib import tcp, http, socks from netlib.exceptions import HttpException, TcpException, NetlibException from netlib.http import http1, http2 -from libpathod import pathoc, test, version, pathod, language +from pathod import pathoc, test, version, pathod, language from netlib.tutils import raises import tutils diff --git a/test/pathod/test_pathoc_cmdline.py b/test/pathod/test_pathoc_cmdline.py index 74dfef57..ab1438d1 100644 --- a/test/pathod/test_pathoc_cmdline.py +++ b/test/pathod/test_pathoc_cmdline.py @@ -1,4 +1,4 @@ -from libpathod import pathoc_cmdline as cmdline +from pathod import pathoc_cmdline as cmdline import tutils import cStringIO import mock diff --git a/test/pathod/test_pathod.py b/test/pathod/test_pathod.py index 6d1df74f..f8eb55f9 100644 --- a/test/pathod/test_pathod.py +++ b/test/pathod/test_pathod.py @@ -3,7 +3,7 @@ import cStringIO import OpenSSL import pytest -from libpathod import pathod, version +from pathod import pathod, version from netlib import tcp, http from netlib.exceptions import HttpException, TlsException import tutils diff --git a/test/pathod/test_pathod_cmdline.py b/test/pathod/test_pathod_cmdline.py index 829c4b32..d156bf50 100644 --- a/test/pathod/test_pathod_cmdline.py +++ b/test/pathod/test_pathod_cmdline.py @@ -1,4 +1,4 @@ -from libpathod import pathod_cmdline as cmdline +from pathod import pathod_cmdline as cmdline import tutils import cStringIO import mock diff --git a/test/pathod/test_test.py b/test/pathod/test_test.py index bd92d864..cee286a4 100644 --- a/test/pathod/test_test.py +++ b/test/pathod/test_test.py @@ -1,6 +1,6 @@ import logging import requests -from libpathod import test +from pathod import test import tutils logging.disable(logging.CRITICAL) diff --git a/test/pathod/test_utils.py b/test/pathod/test_utils.py index 7d24e9e4..4dcedf6e 100644 --- a/test/pathod/test_utils.py +++ b/test/pathod/test_utils.py @@ -1,4 +1,4 @@ -from libpathod import utils +from pathod import utils import tutils diff --git a/test/pathod/tutils.py b/test/pathod/tutils.py index 664cdd52..abe7a59b 100644 --- a/test/pathod/tutils.py +++ b/test/pathod/tutils.py @@ -6,7 +6,7 @@ import cStringIO from contextlib import contextmanager import netlib -from libpathod import utils, test, pathoc, pathod, language +from pathod import utils, test, pathoc, pathod, language from netlib import tcp import requests |