diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2016-02-15 18:43:06 +0100 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2016-02-15 18:43:06 +0100 |
| commit | fc9fa87827d64c770d329b24151f3ef354054d74 (patch) | |
| tree | c0f32f41aa54ce66509853abe99201838eb6500a /test | |
| parent | b7af84552385fa6daf5f594ffa981f8647f7e755 (diff) | |
| download | mitmproxy-fc9fa87827d64c770d329b24151f3ef354054d74.tar.gz mitmproxy-fc9fa87827d64c770d329b24151f3ef354054d74.tar.bz2 mitmproxy-fc9fa87827d64c770d329b24151f3ef354054d74.zip | |
fix ALPN checks
Diffstat (limited to 'test')
| -rw-r--r-- | test/mitmproxy/test_protocol_http2.py | 2 | ||||
| -rw-r--r-- | test/netlib/http/http2/test_connections.py | 4 | ||||
| -rw-r--r-- | test/netlib/test_tcp.py | 2 | ||||
| -rw-r--r-- | test/pathod/test_pathoc.py | 2 | ||||
| -rw-r--r-- | test/pathod/test_pathod.py | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/test/mitmproxy/test_protocol_http2.py b/test/mitmproxy/test_protocol_http2.py index c2c736af..6d3bb43f 100644 --- a/test/mitmproxy/test_protocol_http2.py +++ b/test/mitmproxy/test_protocol_http2.py @@ -26,7 +26,7 @@ import h2 from . import tservers requires_alpn = pytest.mark.skipif( - not OpenSSL._util.lib.Cryptography_HAS_ALPN, + not netlib.tcp.HAS_ALPN, reason="requires OpenSSL with ALPN support") diff --git a/test/netlib/http/http2/test_connections.py b/test/netlib/http/http2/test_connections.py index a115fc7c..8be127e4 100644 --- a/test/netlib/http/http2/test_connections.py +++ b/test/netlib/http/http2/test_connections.py @@ -70,7 +70,7 @@ class TestCheckALPNMatch(tservers.ServerTestBase): alpn_select=b'h2', ) - if OpenSSL._util.lib.Cryptography_HAS_ALPN: + if tcp.HAS_ALPN: def test_check_alpn(self): c = tcp.TCPClient(("127.0.0.1", self.port)) @@ -86,7 +86,7 @@ class TestCheckALPNMismatch(tservers.ServerTestBase): alpn_select=None, ) - if OpenSSL._util.lib.Cryptography_HAS_ALPN: + if tcp.HAS_ALPN: def test_check_alpn(self): c = tcp.TCPClient(("127.0.0.1", self.port)) diff --git a/test/netlib/test_tcp.py b/test/netlib/test_tcp.py index 2b091ef0..8ae3aa51 100644 --- a/test/netlib/test_tcp.py +++ b/test/netlib/test_tcp.py @@ -512,7 +512,7 @@ class TestALPNClient(tservers.ServerTestBase): alpn_select=b"bar" ) - if OpenSSL._util.lib.Cryptography_HAS_ALPN: + if tcp.HAS_ALPN: def test_alpn(self): c = tcp.TCPClient(("127.0.0.1", self.port)) c.connect() diff --git a/test/pathod/test_pathoc.py b/test/pathod/test_pathoc.py index 62696a64..e1d32f79 100644 --- a/test/pathod/test_pathoc.py +++ b/test/pathod/test_pathoc.py @@ -263,7 +263,7 @@ class TestDaemon(_TestDaemon): class TestDaemonHTTP2(_TestDaemon): ssl = True - if OpenSSL._util.lib.Cryptography_HAS_ALPN: + if tcp.HAS_ALPN: def test_http2(self): c = pathoc.Pathoc( diff --git a/test/pathod/test_pathod.py b/test/pathod/test_pathod.py index 98da7d28..ee5fc7bd 100644 --- a/test/pathod/test_pathod.py +++ b/test/pathod/test_pathod.py @@ -282,7 +282,7 @@ class TestHTTP2(tutils.DaemonTests): noapi = True nohang = True - if OpenSSL._util.lib.Cryptography_HAS_ALPN: + if tcp.HAS_ALPN: def test_http2(self): r, _ = self.pathoc(["GET:/"], ssl=True, use_http2=True) |