]> git-server-git.apps.pok.os.sepia.ceph.com Git - s3-tests.git/commitdiff
s3: replace deprecated ssl.wrap_socket() ceph-squid
authorCasey Bodley <cbodley@redhat.com>
Thu, 9 Apr 2026 15:49:20 +0000 (11:49 -0400)
committerCasey Bodley <cbodley@redhat.com>
Fri, 10 Apr 2026 15:15:23 +0000 (11:15 -0400)
this was deprecated in python 3.7 and removed in 3.12

Fixes: https://tracker.ceph.com/issues/75943
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 54796a4965436bf85ffe635411d856f2f4935afe)

s3tests/functional/test_s3.py

index 771e04c0d11d3099d65bb0e45684d63330971322..e4442ebe01fe73aa107e71e2ce7c52b83a12ba05 100644 (file)
@@ -6565,7 +6565,8 @@ def _simple_http_req_100_cont(host, port, is_secure, method, resource):
 
     s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
     if is_secure:
-        s = ssl.wrap_socket(s);
+        ctx = ssl.create_default_context()
+        s = ctx.wrap_socket(s, server_hostname=host);
     s.settimeout(5)
     s.connect((host, port))
     s.send(req)