diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-08-30 13:40:23 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-08-30 13:40:23 +0200 |
| commit | 421b241ff010ae979cff8df504b6744e4c291aeb (patch) | |
| tree | 0d7605c39c834800e93bfa483cc9bf813de62cdd /test | |
| parent | 3873e08339fd701738a1522af32e37363fcec14b (diff) | |
| download | mitmproxy-421b241ff010ae979cff8df504b6744e4c291aeb.tar.gz mitmproxy-421b241ff010ae979cff8df504b6744e4c291aeb.tar.bz2 mitmproxy-421b241ff010ae979cff8df504b6744e4c291aeb.zip | |
remove http2http references
Diffstat (limited to 'test')
| -rw-r--r-- | test/test_cmdline.py | 4 | ||||
| -rw-r--r-- | test/test_server.py | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/test/test_cmdline.py b/test/test_cmdline.py index 1443ee1c..bb54d011 100644 --- a/test/test_cmdline.py +++ b/test/test_cmdline.py @@ -51,10 +51,6 @@ def test_parse_server_spec(): "Invalid server specification", cmdline.parse_server_spec, "http://") - tutils.raises( - "Invalid server specification", - cmdline.parse_server_spec, - "https2http://foo.com") def test_parse_setheaders(): 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 |