aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShadab Zafar <dufferzafar0@gmail.com>2016-07-02 18:18:50 +0530
committerThomas Kriechbaumer <thomas@kriechbaumer.name>2016-07-07 16:39:25 +0200
commitc870d26bc7fbb1b338a9e4bcb1e60d090bf4d99b (patch)
tree2318a675669b215cf2d8aa654f40ae9e17e7fa7f
parenta212ce1f636bf14fdfb7cd7f238626c70bcfacb9 (diff)
downloadmitmproxy-c870d26bc7fbb1b338a9e4bcb1e60d090bf4d99b.tar.gz
mitmproxy-c870d26bc7fbb1b338a9e4bcb1e60d090bf4d99b.tar.bz2
mitmproxy-c870d26bc7fbb1b338a9e4bcb1e60d090bf4d99b.zip
py3++: test_protocol_http2
-rw-r--r--test/mitmproxy/test_protocol_http2.py6
-rw-r--r--tox.ini2
2 files changed, 4 insertions, 4 deletions
diff --git a/test/mitmproxy/test_protocol_http2.py b/test/mitmproxy/test_protocol_http2.py
index 2eb0b120..46d3dc05 100644
--- a/test/mitmproxy/test_protocol_http2.py
+++ b/test/mitmproxy/test_protocol_http2.py
@@ -126,7 +126,7 @@ class _Http2TestBase(object):
client.wfile.flush()
# read CONNECT response
- while client.rfile.readline() != "\r\n":
+ while client.rfile.readline() != b"\r\n":
pass
client.convert_to_ssl(alpn_protos=[b'h2'])
@@ -203,7 +203,7 @@ class TestSimple(_Http2TestBase, _Http2ServerBase):
(':path', '/'),
('ClIeNt-FoO', 'client-bar-1'),
('ClIeNt-FoO', 'client-bar-2'),
- ], body='my request body echoed back to me')
+ ], body=b'my request body echoed back to me')
done = False
while not done:
@@ -275,7 +275,7 @@ class TestWithBodies(_Http2TestBase, _Http2ServerBase):
(':scheme', 'https'),
(':path', '/'),
],
- body='foobar with request body',
+ body=b'foobar with request body',
)
done = False
diff --git a/tox.ini b/tox.ini
index 6e9aa386..4dbc67e4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -16,7 +16,7 @@ commands =
[testenv:py35]
setenv =
- TESTS = test/netlib test/pathod/ test/mitmproxy/script test/mitmproxy/test_contentview.py test/mitmproxy/test_custom_contentview.py test/mitmproxy/test_app.py test/mitmproxy/test_controller.py test/mitmproxy/test_fuzzing.py test/mitmproxy/test_script.py test/mitmproxy/test_web_app.py test/mitmproxy/test_utils.py test/mitmproxy/test_stateobject.py test/mitmproxy/test_cmdline.py test/mitmproxy/test_contrib_tnetstring.py test/mitmproxy/test_proxy.py test/mitmproxy/test_protocol_http1.py test/mitmproxy/test_platform_pf.py test/mitmproxy/test_server.py test/mitmproxy/test_filt.py test/mitmproxy/test_flow_export.py test/mitmproxy/test_web_master.py test/mitmproxy/test_flow_format_compat.py test/mitmproxy/test_examples.py
+ TESTS = test/netlib test/pathod/ test/mitmproxy/script test/mitmproxy/test_contentview.py test/mitmproxy/test_custom_contentview.py test/mitmproxy/test_app.py test/mitmproxy/test_controller.py test/mitmproxy/test_fuzzing.py test/mitmproxy/test_script.py test/mitmproxy/test_web_app.py test/mitmproxy/test_utils.py test/mitmproxy/test_stateobject.py test/mitmproxy/test_cmdline.py test/mitmproxy/test_contrib_tnetstring.py test/mitmproxy/test_proxy.py test/mitmproxy/test_protocol_http1.py test/mitmproxy/test_platform_pf.py test/mitmproxy/test_server.py test/mitmproxy/test_filt.py test/mitmproxy/test_flow_export.py test/mitmproxy/test_web_master.py test/mitmproxy/test_flow_format_compat.py test/mitmproxy/test_examples.py test/mitmproxy/test_protocol_http2.py
HOME = {envtmpdir}
[testenv:docs]