diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2015-05-02 16:46:15 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2015-05-02 16:46:15 +1200 |
| commit | 50b7bfaadcd78e36a0fd3ade5e912a93308e2815 (patch) | |
| tree | eba4b9f8086cec2aed25778c5302206aac279990 /test | |
| parent | 1c26516b1822d82e3b701539591a1d22831e0a19 (diff) | |
| download | mitmproxy-50b7bfaadcd78e36a0fd3ade5e912a93308e2815.tar.gz mitmproxy-50b7bfaadcd78e36a0fd3ade5e912a93308e2815.tar.bz2 mitmproxy-50b7bfaadcd78e36a0fd3ade5e912a93308e2815.zip | |
Adapt to new Pathoc API - silence output to stdout.
Diffstat (limited to 'test')
| -rw-r--r-- | test/test_server.py | 6 | ||||
| -rw-r--r-- | test/tservers.py | 20 |
2 files changed, 18 insertions, 8 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 diff --git a/test/tservers.py b/test/tservers.py index 30c8b52e..bcda0295 100644 --- a/test/tservers.py +++ b/test/tservers.py @@ -129,13 +129,15 @@ class ProxTestBase(object): class HTTPProxTest(ProxTestBase): def pathoc_raw(self): - return libpathod.pathoc.Pathoc(("127.0.0.1", self.proxy.port)) + return libpathod.pathoc.Pathoc(("127.0.0.1", self.proxy.port), fp=None) def pathoc(self, sni=None): """ Returns a connected Pathoc instance. """ - p = libpathod.pathoc.Pathoc(("localhost", self.proxy.port), ssl=self.ssl, sni=sni) + p = libpathod.pathoc.Pathoc( + ("localhost", self.proxy.port), ssl=self.ssl, sni=sni, fp=None + ) if self.ssl: p.connect(("127.0.0.1", self.server.port)) else: @@ -156,7 +158,9 @@ class HTTPProxTest(ProxTestBase): def app(self, page): if self.ssl: - p = libpathod.pathoc.Pathoc(("127.0.0.1", self.proxy.port), True) + p = libpathod.pathoc.Pathoc( + ("127.0.0.1", self.proxy.port), True, fp=None + ) p.connect((APP_HOST, APP_PORT)) return p.request("get:'%s'"%page) else: @@ -208,7 +212,9 @@ class TransparentProxTest(ProxTestBase): """ Returns a connected Pathoc instance. """ - p = libpathod.pathoc.Pathoc(("localhost", self.proxy.port), ssl=self.ssl, sni=sni) + p = libpathod.pathoc.Pathoc( + ("localhost", self.proxy.port), ssl=self.ssl, sni=sni, fp=None + ) p.connect() return p @@ -231,7 +237,9 @@ class ReverseProxTest(ProxTestBase): """ Returns a connected Pathoc instance. """ - p = libpathod.pathoc.Pathoc(("localhost", self.proxy.port), ssl=self.ssl, sni=sni) + p = libpathod.pathoc.Pathoc( + ("localhost", self.proxy.port), ssl=self.ssl, sni=sni, fp=None + ) p.connect() return p @@ -296,4 +304,4 @@ class ChainProxTest(ProxTestBase): return d class HTTPUpstreamProxTest(ChainProxTest, HTTPProxTest): - pass
\ No newline at end of file + pass |