diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/mitmproxy/test_proxy_config.py | 6 | ||||
| -rw-r--r-- | test/mitmproxy/test_server.py | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/test/mitmproxy/test_proxy_config.py b/test/mitmproxy/test_proxy_config.py index 2f31d502..d8085eb8 100644 --- a/test/mitmproxy/test_proxy_config.py +++ b/test/mitmproxy/test_proxy_config.py @@ -8,13 +8,13 @@ def test_parse_server_spec(): "Invalid server specification", config.parse_server_spec, "" ) assert config.parse_server_spec("http://foo.com:88") == ( - b"http", (b"foo.com", 88) + "http", ("foo.com", 88) ) assert config.parse_server_spec("http://foo.com") == ( - b"http", (b"foo.com", 80) + "http", ("foo.com", 80) ) assert config.parse_server_spec("https://foo.com") == ( - b"https", (b"foo.com", 443) + "https", ("foo.com", 443) ) tutils.raises( "Invalid server specification", diff --git a/test/mitmproxy/test_server.py b/test/mitmproxy/test_server.py index ca3f8a97..73e070ac 100644 --- a/test/mitmproxy/test_server.py +++ b/test/mitmproxy/test_server.py @@ -486,7 +486,7 @@ class TestHttps2Http(tservers.ReverseProxyTest): def get_proxy_config(cls): d, opts = super(TestHttps2Http, cls).get_proxy_config() s = parse_server_spec(opts.upstream_server) - opts.upstream_server = "http://%s" % s.address.decode("ascii") + opts.upstream_server = "http://%s" % s.address return d, opts def pathoc(self, ssl, sni=None): |