Fix the test.

Author: ZeroIntensity

Lib/test/test_ssl.py

@@ -4628,20 +4628,24 @@ def test_thread_recv_while_main_thread_sends(self):
         # if a thread started to infinitely block until data was received, calls
         # to send() would deadlock, because it would wait forever on the lock
         # that the recv() call held.
-        data = b"A" * 5000
+        data = b"a" * 500
         def background(sock):
-            received = sock.recv(5000)
-            assert received == data
+            received = sock.recv(500)
+            self.assertEqual(received, data)
 
-        client_context, server_context, _ = testing_context()
+        client_context, server_context, hostname = testing_context()
         server = ThreadedEchoServer(context=server_context)
         with server:
-            with client_context.wrap_socket(socket.socket()) as sock:
+            with client_context.wrap_socket(socket.socket(),
+                                            server_hostname=hostname) as sock:
                 sock.connect((HOST, server.port))
-                thread = threading.Thread(target=background, args=(sock,))
-                thread.start()
-                sock.sendall(data)
-
+                with threading_helper.catch_threading_exception() as cm:
+                    thread = threading.Thread(target=background, args=(sock,))
+                    thread.start()
+                    sock.sendall(data)
+                    thread.join()
+                    if cm.exc_value is not None:
+                        raise cm.exc_value
 
 @unittest.skipUnless(has_tls_version('TLSv1_3') and ssl.HAS_PHA,
                      "Test needs TLS 1.3 PHA")

Modules/_ssl.c

@@ -366,9 +366,6 @@ typedef struct {
      * and shutdown methods check for chained exceptions.
      */
     PyObject *exc;
-    /* Lock to synchronize calls when the thread state is detached.
-       See also gh-134698. */
-    PyMutex tstate_mutex;
 } PySSLSocket;
 
 #define PySSLSocket_CAST(op)    ((PySSLSocket *)(op))
@@ -918,7 +915,6 @@ newPySSLSocket(PySSLContext *sslctx, PySocketSockObject *sock,
     self->server_hostname = NULL;
     self->err = err;
     self->exc = NULL;
-    self->tstate_mutex = (PyMutex){0};
 
     /* Make sure the SSL error state is initialized */
     ERR_clear_error();

Modules/_ssl/debughelpers.c

@@ -140,7 +140,6 @@ _PySSL_keylog_callback(const SSL *ssl, const char *line)
      * critical debug helper.
      */
 
-    assert(PyMutex_IsLocked(&ssl_obj->tstate_mutex));
     Py_BEGIN_ALLOW_THREADS
     PyThread_acquire_lock(lock, 1);
     res = BIO_printf(ssl_obj->ctx->keylog_bio, "%s\n", line);