diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2013-12-08 14:14:31 +0100 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2013-12-08 14:14:31 +0100 |
| commit | e3c69fd105f925009fdf31efe8598f70e2950ab4 (patch) | |
| tree | b61bb99ae8e34f73583263619730fbbe5d526161 /test/test_server.py | |
| parent | 948d4c0445f006640d08d96dc3d6e604df78bc99 (diff) | |
| parent | 3a1d85ab18dbff82505feac3619af733a0a2b4f7 (diff) | |
| download | mitmproxy-e3c69fd105f925009fdf31efe8598f70e2950ab4.tar.gz mitmproxy-e3c69fd105f925009fdf31efe8598f70e2950ab4.tar.bz2 mitmproxy-e3c69fd105f925009fdf31efe8598f70e2950ab4.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'test/test_server.py')
| -rw-r--r-- | test/test_server.py | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/test/test_server.py b/test/test_server.py index 079ed8ce..e9a6b727 100644 --- a/test/test_server.py +++ b/test/test_server.py @@ -191,16 +191,6 @@ class TestHTTPS(tservers.HTTPProxTest, CommonMixin): assert p.request("get:/:i0,'invalid\r\n\r\n'").status_code == 400 -class TestHTTPSNoUpstream(tservers.HTTPProxTest, CommonMixin): - ssl = True - no_upstream_cert = True - def test_cert_gen_error(self): - f = self.pathoc_raw() - f.connect((u"foo..bar".encode("utf8"), 0)) - f.request("get:/") - assert "dummy cert" in "".join(self.proxy.log) - - class TestHTTPSCertfile(tservers.HTTPProxTest, CommonMixin): ssl = True certfile = True |