diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2014-01-28 19:28:20 +0100 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2014-01-28 19:28:20 +0100 |
| commit | b994fb5a2753c4b6ceff75a9227880a0127c5a93 (patch) | |
| tree | 0bdaa02c5fb43e963ad30c40513c37527f285e42 /test/test_pathoc.py | |
| parent | 1b566869de4d07d509fa2ead6b91486326a9e5a4 (diff) | |
| download | mitmproxy-b994fb5a2753c4b6ceff75a9227880a0127c5a93.tar.gz mitmproxy-b994fb5a2753c4b6ceff75a9227880a0127c5a93.tar.bz2 mitmproxy-b994fb5a2753c4b6ceff75a9227880a0127c5a93.zip | |
adjust to signature changes in netlib.tcp
Diffstat (limited to 'test/test_pathoc.py')
| -rw-r--r-- | test/test_pathoc.py | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/test/test_pathoc.py b/test/test_pathoc.py index 7493b2e7..d96a1728 100644 --- a/test/test_pathoc.py +++ b/test/test_pathoc.py @@ -27,8 +27,7 @@ class _TestDaemon: def test_info(self): c = pathoc.Pathoc( - "127.0.0.1", - self.d.port, + ("127.0.0.1", self.d.port), ssl = self.ssl ) c.connect() @@ -41,8 +40,7 @@ class TestDaemonSSL(_TestDaemon): ssloptions = pathod.SSLOptions(request_client_cert=True) def test_sni(self): c = pathoc.Pathoc( - "127.0.0.1", - self.d.port, + ("127.0.0.1", self.d.port), ssl = True, sni = "foobar.com" ) @@ -54,8 +52,7 @@ class TestDaemonSSL(_TestDaemon): def test_clientcert(self): c = pathoc.Pathoc( - "127.0.0.1", - self.d.port, + ("127.0.0.1", self.d.port), ssl = True, clientcert = tutils.test_data.path("data/clientcert/client.pem") ) @@ -69,7 +66,7 @@ class TestDaemonSSL(_TestDaemon): class TestDaemon(_TestDaemon): ssl = False def tval(self, requests, showreq=False, showresp=False, explain=False, hexdump=False, timeout=None, ignorecodes=None, ignoretimeout=None): - c = pathoc.Pathoc("127.0.0.1", self.d.port) + c = pathoc.Pathoc(("127.0.0.1", self.d.port)) c.connect() if timeout: c.settimeout(timeout) @@ -88,7 +85,7 @@ class TestDaemon(_TestDaemon): return s.getvalue() def test_ssl_error(self): - c = pathoc.Pathoc("127.0.0.1", self.d.port, ssl = True) + c = pathoc.Pathoc(("127.0.0.1", self.d.port), ssl = True) tutils.raises("ssl handshake", c.connect) def test_ignorecodes(self): @@ -135,7 +132,7 @@ class TestDaemon(_TestDaemon): def test_connect_fail(self): to = ("foobar", 80) - c = pathoc.Pathoc("127.0.0.1", self.d.port) + c = pathoc.Pathoc(("127.0.0.1", self.d.port)) c.rfile, c.wfile = cStringIO.StringIO(), cStringIO.StringIO() tutils.raises("connect failed", c.http_connect, to) c.rfile = cStringIO.StringIO( |