From ccd7d28680013d7b0e878882a80be543d0f8fe39 Mon Sep 17 00:00:00 2001 From: coletdjnz Date: Sun, 14 Jul 2024 13:18:25 +1200 Subject: [PATCH] skip tests if using pypy --- test/test_http_proxy.py | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/test/test_http_proxy.py b/test/test_http_proxy.py index 102fc4d4f..1d17a8d00 100644 --- a/test/test_http_proxy.py +++ b/test/test_http_proxy.py @@ -398,6 +398,10 @@ def test_http_with_idn(self, handler, ctx): ('Websockets', 'ws'), ('Websockets', 'wss'), ], indirect=True) +@pytest.mark.skip_handler_if( + 'Websockets', lambda request: + platform.python_implementation() == 'PyPy', + 'Tests are flaky with PyPy, unknown reason') class TestHTTPConnectProxy: def test_http_connect_no_auth(self, handler, ctx): with ctx.http_server(HTTPConnectProxyHandler) as server_address: @@ -446,11 +450,6 @@ def test_http_connect_source_address(self, handler, ctx): assert proxy_info['client_address'][0] == source_address @pytest.mark.skipif(urllib3 is None, reason='requires urllib3 to test') - @pytest.mark.skip_handler_if( - 'Websockets', lambda request: - (platform.python_implementation() == 'PyPy' - and request.getfixturevalue('ctx').REQUEST_PROTO == 'wss'), - 'PyPy sometimes fails with WSS over TLS tests, unknown reason') def test_https_connect_proxy(self, handler, ctx): with ctx.http_server(HTTPSConnectProxyHandler) as server_address: with handler(verify=False, proxies={ctx.REQUEST_PROTO: f'https://{server_address}'}) as rh: @@ -460,11 +459,6 @@ def test_https_connect_proxy(self, handler, ctx): assert 'Proxy-Authorization' not in proxy_info['headers'] @pytest.mark.skipif(urllib3 is None, reason='requires urllib3 to test') - @pytest.mark.skip_handler_if( - 'Websockets', lambda request: - (platform.python_implementation() == 'PyPy' - and request.getfixturevalue('ctx').REQUEST_PROTO == 'wss'), - 'PyPy sometimes fails with WSS over TLS tests, unknown reason') def test_https_connect_verify_failed(self, handler, ctx): with ctx.http_server(HTTPSConnectProxyHandler) as server_address: with handler(verify=True, proxies={ctx.REQUEST_PROTO: f'https://{server_address}'}) as rh: @@ -475,11 +469,6 @@ def test_https_connect_verify_failed(self, handler, ctx): ctx.proxy_info_request(rh) @pytest.mark.skipif(urllib3 is None, reason='requires urllib3 to test') - @pytest.mark.skip_handler_if( - 'Websockets', lambda request: - (platform.python_implementation() == 'PyPy' - and request.getfixturevalue('ctx').REQUEST_PROTO == 'wss'), - 'PyPy sometimes fails with WSS over TLS tests, unknown reason') def test_https_connect_proxy_auth(self, handler, ctx): with ctx.http_server(HTTPSConnectProxyHandler, username='test', password='test') as server_address: with handler(verify=False, proxies={ctx.REQUEST_PROTO: f'https://test:test@{server_address}'}) as rh: