diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-09-20 19:56:45 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-09-20 19:56:45 +0200 |
| commit | 0ad5cbc6bf5e9c4d0b5af85544b77dcb29cddb56 (patch) | |
| tree | 89338e320bb913147ee19dfc250ad5891680057b /test/test_tcp.py | |
| parent | 693cdfc6d75e460a00585ccc9b734b80d6eba74d (diff) | |
| download | mitmproxy-0ad5cbc6bf5e9c4d0b5af85544b77dcb29cddb56.tar.gz mitmproxy-0ad5cbc6bf5e9c4d0b5af85544b77dcb29cddb56.tar.bz2 mitmproxy-0ad5cbc6bf5e9c4d0b5af85544b77dcb29cddb56.zip | |
python3++
Diffstat (limited to 'test/test_tcp.py')
| -rw-r--r-- | test/test_tcp.py | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/test/test_tcp.py b/test/test_tcp.py index dc0efeb0..725aa8b0 100644 --- a/test/test_tcp.py +++ b/test/test_tcp.py @@ -49,9 +49,9 @@ class ALPNHandler(tcp.BaseHandler): def handle(self): alp = self.get_alpn_proto_negotiated() if alp: - self.wfile.write("%s" % alp) + self.wfile.write(("%s" % alp).encode("ascii")) else: - self.wfile.write("NONE") + self.wfile.write(b"NONE") self.wfile.flush() @@ -503,24 +503,24 @@ class TestALPNClient(tservers.ServerTestBase): def test_alpn(self): c = tcp.TCPClient(("127.0.0.1", self.port)) c.connect() - c.convert_to_ssl(alpn_protos=["foo", "bar", "fasel"]) - assert c.get_alpn_proto_negotiated() == "bar" - assert c.rfile.readline().strip() == "bar" + c.convert_to_ssl(alpn_protos=[b"foo", b"bar", b"fasel"]) + assert c.get_alpn_proto_negotiated() == b"bar" + assert c.rfile.readline().strip() == b"bar" def test_no_alpn(self): c = tcp.TCPClient(("127.0.0.1", self.port)) c.connect() c.convert_to_ssl() - assert c.get_alpn_proto_negotiated() == "" - assert c.rfile.readline().strip() == "NONE" + assert c.get_alpn_proto_negotiated() == b"" + assert c.rfile.readline().strip() == b"NONE" else: def test_none_alpn(self): c = tcp.TCPClient(("127.0.0.1", self.port)) c.connect() - c.convert_to_ssl(alpn_protos=["foo", "bar", "fasel"]) - assert c.get_alpn_proto_negotiated() == "" - assert c.rfile.readline() == "NONE" + c.convert_to_ssl(alpn_protos=[b"foo", b"bar", b"fasel"]) + assert c.get_alpn_proto_negotiated() == b"" + assert c.rfile.readline() == b"NONE" class TestNoSSLNoALPNClient(tservers.ServerTestBase): |