diff options
author | Aldo Cortesi <aldo@corte.si> | 2016-10-17 18:21:23 +1300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-17 18:21:23 +1300 |
commit | 00071238d2e79ff91132b7e5a3bcc8019d9191ec (patch) | |
tree | 507c346e8f8c605d428140274678fced2e6bbc16 /test/pathod | |
parent | 666c59cbfbcbd28062c201c3cb5d6cb928e90aee (diff) | |
parent | c774a9fec93feedc37a450400a03b83f5f4cb4b9 (diff) | |
download | mitmproxy-00071238d2e79ff91132b7e5a3bcc8019d9191ec.tar.gz mitmproxy-00071238d2e79ff91132b7e5a3bcc8019d9191ec.tar.bz2 mitmproxy-00071238d2e79ff91132b7e5a3bcc8019d9191ec.zip |
Merge pull request #1617 from cortesi/object
python3
Diffstat (limited to 'test/pathod')
-rw-r--r-- | test/pathod/__init__.py | 1 | ||||
-rw-r--r-- | test/pathod/test_language_base.py | 2 | ||||
-rw-r--r-- | test/pathod/test_pathod.py | 2 | ||||
-rw-r--r-- | test/pathod/test_protocols_http2.py | 12 | ||||
-rw-r--r-- | test/pathod/tutils.py | 2 |
5 files changed, 9 insertions, 10 deletions
diff --git a/test/pathod/__init__.py b/test/pathod/__init__.py index 3f5dc124..e69de29b 100644 --- a/test/pathod/__init__.py +++ b/test/pathod/__init__.py @@ -1 +0,0 @@ -from __future__ import (print_function, absolute_import, division) diff --git a/test/pathod/test_language_base.py b/test/pathod/test_language_base.py index 12a235e4..b8abc9ba 100644 --- a/test/pathod/test_language_base.py +++ b/test/pathod/test_language_base.py @@ -343,7 +343,7 @@ def test_unique_name(): assert b.unique_name -class test_boolean(): +class test_boolean: e = TBoolean.expr() assert e.parseString("test")[0].value assert not e.parseString("-test")[0].value diff --git a/test/pathod/test_pathod.py b/test/pathod/test_pathod.py index d119348a..89d7c562 100644 --- a/test/pathod/test_pathod.py +++ b/test/pathod/test_pathod.py @@ -7,7 +7,7 @@ from netlib.exceptions import HttpException, TlsException from . import tutils -class TestPathod(object): +class TestPathod: def test_logging(self): s = io.StringIO() diff --git a/test/pathod/test_protocols_http2.py b/test/pathod/test_protocols_http2.py index 7f65c0eb..7300cc1d 100644 --- a/test/pathod/test_protocols_http2.py +++ b/test/pathod/test_protocols_http2.py @@ -169,7 +169,7 @@ class TestPerformClientConnectionPreface(netlib_tservers.ServerTestBase): assert protocol.connection_preface_performed -class TestClientStreamIds(object): +class TestClientStreamIds: c = tcp.TCPClient(("127.0.0.1", 0)) protocol = HTTP2StateProtocol(c) @@ -183,7 +183,7 @@ class TestClientStreamIds(object): assert self.protocol.current_stream_id == 5 -class TestserverstreamIds(object): +class TestserverstreamIds: c = tcp.TCPClient(("127.0.0.1", 0)) protocol = HTTP2StateProtocol(c, is_server=True) @@ -230,7 +230,7 @@ class TestApplySettings(netlib_tservers.ServerTestBase): hyperframe.frame.SettingsFrame.INITIAL_WINDOW_SIZE] == 'deadbeef' -class TestCreateHeaders(object): +class TestCreateHeaders: c = tcp.TCPClient(("127.0.0.1", 0)) def test_create_headers(self): @@ -267,7 +267,7 @@ class TestCreateHeaders(object): assert bytes[2] == codecs.decode('00000209040000000163d5', 'hex_codec') -class TestCreateBody(object): +class TestCreateBody: c = tcp.TCPClient(("127.0.0.1", 0)) def test_create_body_empty(self): @@ -422,7 +422,7 @@ class TestReadEmptyResponse(netlib_tservers.ServerTestBase): assert resp.content == b'' -class TestAssembleRequest(object): +class TestAssembleRequest: c = tcp.TCPClient(("127.0.0.1", 0)) def test_request_simple(self): @@ -476,7 +476,7 @@ class TestAssembleRequest(object): codecs.decode('000006000100000001666f6f626172', 'hex_codec') -class TestAssembleResponse(object): +class TestAssembleResponse: c = tcp.TCPClient(("127.0.0.1", 0)) def test_simple(self): diff --git a/test/pathod/tutils.py b/test/pathod/tutils.py index 518485ba..c2243578 100644 --- a/test/pathod/tutils.py +++ b/test/pathod/tutils.py @@ -23,7 +23,7 @@ def treader(bytes): return tcp.Reader(fp) -class DaemonTests(object): +class DaemonTests: nohang = False ssl = False timeout = None |