test state of Threadhandle in test of is_running

Author: YvesDup

Lib/test/test_threading.py

@@ -1458,25 +1458,23 @@ def run_in_bg():
         self.assertEqual(err, b"")
         self.assertEqual(out.strip(), b"Exiting...")
 
+    def _nothing(self):
+        pass
+
+    def _set_ident_error(self):
+        1/0
+
     def test_error_bootstrap(self):
         # gh-140746: Test that Thread.start() doesn't hang indefinitely if
         # the new thread fails (MemoryError in the referenced issue)
         # during its initialization
 
-        def nothing():
-            pass
-
-        def _set_ident_error():
-            1/0
 
+        thread = threading.Thread(target=self._nothing)
         with support.catch_unraisable_exception(), self.assertRaises(RuntimeError):
-            thread = threading.Thread(target=nothing)
-            thread._set_ident = _set_ident_error
+            thread._set_ident = self._set_ident_error
             thread.start()
 
-        # Give the thread a moment to clean up after itself
-        # specially in free-threading builds.
-        time.sleep(0.1)
         self.assertFalse(thread.is_alive())
         self.assertFalse(thread in threading._limbo)
         self.assertFalse(thread in threading._active)

Modules/_threadmodule.c

@@ -98,7 +98,7 @@ class _thread.RLock "rlockobject *" "clinic_state()->rlock_type"
 //     NOT_STARTED -> STARTING -> RUNNING -> DONE
 //                       |                    ^
 //                       |                    |
-//                       +----- FAILED --------+
+//                       +----- FAILED -------+
 typedef enum {
     THREAD_HANDLE_NOT_STARTED = 1,
     THREAD_HANDLE_STARTING = 2,
@@ -398,7 +398,7 @@ thread_run(void *boot_raw)
             PyErr_FormatUnraisable(
                 "Exception ignored in thread started by %R", boot->func);
         }
-        // Notify that the bootstrap is done and failed (e.g. Memory error).
+        // Notify that bootstrap is done and failed (e.g. Memory error).
         set_thread_handle_state(handle, THREAD_HANDLE_FAILED);
         _PyEvent_Notify(&handle->thread_is_running);
     }
@@ -722,7 +722,8 @@ static PyObject *
 PyThreadHandleObject_is_running(PyObject *op, PyObject *Py_UNUSED(dummy))
 {
     PyThreadHandleObject *self = PyThreadHandleObject_CAST(op);
-    if (_PyEvent_IsSet(&self->handle->thread_is_running)) {
+    if (get_thread_handle_state(self->handle) == THREAD_HANDLE_RUNNING
+        && _PyEvent_IsSet(&self->handle->thread_is_running)) {
         Py_RETURN_TRUE;
     }
     else {
@@ -2944,4 +2945,4 @@ PyMODINIT_FUNC
 PyInit__thread(void)
 {
     return PyModuleDef_Init(&thread_module);
-}
+}