From 6c585b9de81fcd4ab4fd0d9e0af5db7a27553e7f Mon Sep 17 00:00:00 2001 From: coletdjnz Date: Sun, 14 Jul 2024 11:50:17 +1200 Subject: [PATCH] test --- test/test_http_proxy.py | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/test/test_http_proxy.py b/test/test_http_proxy.py index ba0c22dc7e..f0d02348e1 100644 --- a/test/test_http_proxy.py +++ b/test/test_http_proxy.py @@ -160,7 +160,7 @@ class WebSocketProxyHandler(BaseRequestHandler): import websockets.sync.server self.request.settimeout(None) protocol = websockets.ServerProtocol() - connection = websockets.sync.server.ServerConnection(socket=self.request, protocol=protocol, close_timeout=2) + connection = websockets.sync.server.ServerConnection(socket=self.request, protocol=protocol, close_timeout=0) connection.handshake() for message in connection: if message == 'proxy_info': @@ -438,11 +438,11 @@ class TestHTTPConnectProxy: 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') + # @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: @@ -452,11 +452,11 @@ class TestHTTPConnectProxy: 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') + # @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: @@ -467,11 +467,11 @@ class TestHTTPConnectProxy: 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') + # @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: