diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-05-02 16:24:47 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-05-02 16:24:47 +0200 |
| commit | a7d90ccec7aa32d20ac398b782fbfb985484685b (patch) | |
| tree | f3b397d1788787cc2a9e7c19b0386e3d6a10dbd1 /test/test_server.py | |
| parent | 62ff239e414d4fc912eaab52385eaaf028b7e34c (diff) | |
| parent | e1d3ebb446760be512850ee78030687c30145a79 (diff) | |
| download | mitmproxy-a7d90ccec7aa32d20ac398b782fbfb985484685b.tar.gz mitmproxy-a7d90ccec7aa32d20ac398b782fbfb985484685b.tar.bz2 mitmproxy-a7d90ccec7aa32d20ac398b782fbfb985484685b.zip | |
Merge branch 'master' of github.com:mitmproxy/mitmproxy
Diffstat (limited to 'test/test_server.py')
| -rw-r--r-- | test/test_server.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/test/test_server.py b/test/test_server.py index 0f0afd7f..7f93c729 100644 --- a/test/test_server.py +++ b/test/test_server.py @@ -353,7 +353,9 @@ class TestHttps2Http(tservers.ReverseProxTest): """ Returns a connected Pathoc instance. """ - p = libpathod.pathoc.Pathoc(("localhost", self.proxy.port), ssl=ssl, sni=sni) + p = libpathod.pathoc.Pathoc( + ("localhost", self.proxy.port), ssl=ssl, sni=sni, fp=None + ) p.connect() return p @@ -380,7 +382,7 @@ class TestTransparentSSL(tservers.TransparentProxTest, CommonMixin, TcpMixin): ssl = True def test_sslerr(self): - p = pathoc.Pathoc(("localhost", self.proxy.port)) + p = pathoc.Pathoc(("localhost", self.proxy.port), fp=None) p.connect() r = p.request("get:/") assert r.status_code == 400 |