aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2015-08-30 02:27:38 +0200
committerMaximilian Hils <git@maximilianhils.com>2015-08-30 02:27:38 +0200
commit1dd09a5509219e7390abbb8c0b6818c7e792daa1 (patch)
treeef1f433ebbcb05003b7648f8cabdfce7f2f00de5 /test
parentdd7f50d64bef38fa67b4cace91913d03691dde26 (diff)
downloadmitmproxy-1dd09a5509219e7390abbb8c0b6818c7e792daa1.tar.gz
mitmproxy-1dd09a5509219e7390abbb8c0b6818c7e792daa1.tar.bz2
mitmproxy-1dd09a5509219e7390abbb8c0b6818c7e792daa1.zip
always insert tls layer for inline script upgrades
Diffstat (limited to 'test')
-rw-r--r--test/test_cmdline.py4
-rw-r--r--test/test_server.py4
2 files changed, 0 insertions, 8 deletions
diff --git a/test/test_cmdline.py b/test/test_cmdline.py
index ee2f7044..1443ee1c 100644
--- a/test/test_cmdline.py
+++ b/test/test_cmdline.py
@@ -43,10 +43,6 @@ def test_parse_server_spec():
"http://foo.com") == ("http", ("foo.com", 80))
assert cmdline.parse_server_spec(
"https://foo.com") == ("https", ("foo.com", 443))
- assert cmdline.parse_server_spec_special(
- "https2http://foo.com") == ("https2http", ("foo.com", 80))
- assert cmdline.parse_server_spec_special(
- "http2https://foo.com") == ("http2https", ("foo.com", 443))
tutils.raises(
"Invalid server specification",
cmdline.parse_server_spec,
diff --git a/test/test_server.py b/test/test_server.py
index 7b66c582..b691804b 100644
--- a/test/test_server.py
+++ b/test/test_server.py
@@ -490,10 +490,6 @@ class TestHttps2Http(tservers.ReverseProxTest):
assert p.request("get:'/p/200'").status_code == 200
assert all("Error in handle_sni" not in msg for msg in self.proxy.log)
- def test_http(self):
- p = self.pathoc(ssl=False)
- assert p.request("get:'/p/200'").status_code == 502
-
class TestTransparent(tservers.TransparentProxTest, CommonMixin, TcpMixin):
ssl = False