diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2013-12-08 14:14:57 +0100 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2013-12-08 14:14:57 +0100 |
| commit | a509a9037b265d8a96756af91e2978ab95a2b81e (patch) | |
| tree | 16509a91179ec886ef30e2036ec45ad5dc685e14 /test | |
| parent | 4dcb2435fc3fba64a0cdc8d2acd5038fc140da13 (diff) | |
| parent | e3c69fd105f925009fdf31efe8598f70e2950ab4 (diff) | |
| download | mitmproxy-a509a9037b265d8a96756af91e2978ab95a2b81e.tar.gz mitmproxy-a509a9037b265d8a96756af91e2978ab95a2b81e.tar.bz2 mitmproxy-a509a9037b265d8a96756af91e2978ab95a2b81e.zip | |
Merge branch 'master' into 0.10
Diffstat (limited to 'test')
| -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 85c20737..d832ff18 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 |