From f5cfe9e00a501e77c75aeb5fb1bf9686f128b76c Mon Sep 17 00:00:00 2001 From: coletdjnz Date: Sat, 18 May 2024 14:02:26 +1200 Subject: [PATCH] test: always use SSLTransport if available (so it is used for both ends of tls-in-tls) --- test/test_http_proxy.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/test/test_http_proxy.py b/test/test_http_proxy.py index 4ebdf0148..e5b41ce88 100644 --- a/test/test_http_proxy.py +++ b/test/test_http_proxy.py @@ -139,7 +139,7 @@ def __init__(self, request, *args, **kwargs): certfn = os.path.join(TEST_DIR, 'testcert.pem') sslctx = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER) sslctx.load_cert_chain(certfn, None) - if isinstance(request, ssl.SSLSocket): + if SSLTransport: request = SSLTransport(request, ssl_context=sslctx, server_side=True) else: request = sslctx.wrap_socket(request, server_side=True) @@ -208,7 +208,10 @@ def __init__(self, request, *args, **kwargs): certfn = os.path.join(TEST_DIR, 'testcert.pem') sslctx = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER) sslctx.load_cert_chain(certfn, None) - request = sslctx.wrap_socket(request, server_side=True) + if SSLTransport: + request = SSLTransport(request, ssl_context=sslctx, server_side=True) + else: + request = sslctx.wrap_socket(request, server_side=True) self._original_request = request super().__init__(request, *args, **kwargs)