diff --git a/httpie/compat.py b/httpie/compat.py index 518ad17f..eb26c2be 100644 --- a/httpie/compat.py +++ b/httpie/compat.py @@ -4,7 +4,7 @@ Python 2.6, 2.7, and 3.x compatibility. """ # Borrow these from requests: # noinspection PyUnresolvedReferences -from requests.compat import is_windows, bytes, str, is_py3, is_py26 +from requests.compat import is_windows, bytes, str, is_py3, is_py26, is_pypy try: # pragma: no cover # noinspection PyUnresolvedReferences,PyCompatibility diff --git a/tests/test_ssl.py b/tests/test_ssl.py index 0fda4106..2e303555 100644 --- a/tests/test_ssl.py +++ b/tests/test_ssl.py @@ -5,6 +5,7 @@ import pytest_httpbin.certs from requests.exceptions import SSLError from httpie import ExitStatus +from httpie.compat import is_pypy from utils import http, HTTP_OK, TESTS_ROOT @@ -18,6 +19,9 @@ CLIENT_PEM = os.path.join(TESTS_ROOT, 'client_certs', 'client.pem') CA_BUNDLE = pytest_httpbin.certs.where() +@pytest.mark.skipif( + is_pypy, + reason='https://github.com/jakubroztocil/httpie/issues/308') class TestClientSSLCertHandling(object): def test_cert_file_not_found(self, httpbin_secure): @@ -54,6 +58,9 @@ class TestClientSSLCertHandling(object): assert HTTP_OK in r +@pytest.mark.skipif( + is_pypy, + reason='https://github.com/jakubroztocil/httpie/issues/308') class TestServerSSLCertHandling(object): def test_self_signed_server_cert_by_default_raises_ssl_error(