aboutsummaryrefslogtreecommitdiffstats
path: root/test/test_server.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2015-08-30 13:40:23 +0200
committerMaximilian Hils <git@maximilianhils.com>2015-08-30 13:40:23 +0200
commit421b241ff010ae979cff8df504b6744e4c291aeb (patch)
tree0d7605c39c834800e93bfa483cc9bf813de62cdd /test/test_server.py
parent3873e08339fd701738a1522af32e37363fcec14b (diff)
downloadmitmproxy-421b241ff010ae979cff8df504b6744e4c291aeb.tar.gz
mitmproxy-421b241ff010ae979cff8df504b6744e4c291aeb.tar.bz2
mitmproxy-421b241ff010ae979cff8df504b6744e4c291aeb.zip
remove http2http references
Diffstat (limited to 'test/test_server.py')
-rw-r--r--test/test_server.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/test/test_server.py b/test/test_server.py
index b691804b..66c3a0ae 100644
--- a/test/test_server.py
+++ b/test/test_server.py
@@ -468,7 +468,7 @@ class TestHttps2Http(tservers.ReverseProxTest):
@classmethod
def get_proxy_config(cls):
d = super(TestHttps2Http, cls).get_proxy_config()
- d["upstream_server"] = ("https2http", d["upstream_server"][1])
+ d["upstream_server"] = ("http", d["upstream_server"][1])
return d
def pathoc(self, ssl, sni=None):
@@ -476,7 +476,7 @@ class TestHttps2Http(tservers.ReverseProxTest):
Returns a connected Pathoc instance.
"""
p = pathoc.Pathoc(
- ("localhost", self.proxy.port), ssl=ssl, sni=sni, fp=None
+ ("localhost", self.proxy.port), ssl=True, sni=sni, fp=None
)
p.connect()
return p
@@ -490,6 +490,10 @@ 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 == 200
+
class TestTransparent(tservers.TransparentProxTest, CommonMixin, TcpMixin):
ssl = False