Fix and move tests.

ZeroIntensity · Nov 10, 2024 · Nov 10, 2024 · Nov 10, 2024 · Nov 10, 2024 · Nov 10, 2024
commit e4b2c792f8a8ccec915162073cc74fe1f57a5b60
diff --git a/Lib/test/test_free_threading/test_interpreters.py b/Lib/test/test_free_threading/test_interpreters.py
@@ -0,0 +1,24 @@
+import threading
+import unittest
+
+from test import support
+from test.support import import_helper
+from test.support import threading_helper
+_interpreters = import_helper.import_module('_interpreters')
+
+
+@threading_helper.requires_working_threading()
+class StressTests(unittest.TestCase):
+
+    @support.requires_resource('cpu')
+    def test_subinterpreter_thread_safety(self):
+        interp = _interpreters.create()
+        threads = [threading.Thread(target=_interpreters.run_string, args=(interp, "1")) for _ in range(100)]
+        threads.extend([threading.Thread(target=_interpreters.destroy, args=(interp,)) for _ in range(100)])
+        with threading_helper.start_threads(threads):
+            pass
+
+
+if __name__ == '__main__':
+    # Test needs to be a package, so we can do relative imports.
+    unittest.main()
diff --git a/Lib/test/test_interpreters/test_stress.py b/Lib/test/test_interpreters/test_stress.py
@@ -32,15 +32,6 @@ def task():
         with threading_helper.start_threads(threads):
             pass
 
-    @support.requires_resource('cpu')
-    @unittest.skipUnless(support.Py_GIL_DISABLED, "the GIL is protecting threads")
-    def test_subinterpreter_thread_safety(self):
-        interp = interpreters.create()
-        threads = [threading.Thread(target=interpreters.run_string, args=(interp,)) for _ in range(100)]
-        threads.extend([threading.Thread(target=interpreters.destroy, args=(interp,)) for _ in range(100)])
-        with threading_helper.start_threads(threads):
-            pass
-
 
 if __name__ == '__main__':
     # Test needs to be a package, so we can do relative imports.

@@ -723,14 +723,14 @@ interp_destroy(PyObject *self, PyObject *args, PyObject *kwds)
                         "interpreter started running during shutdown");
         return NULL;
     }
-#endif
 
     /*
      * Running main has now been prevented, the interpreter will
      * never run again (GH-126644).
      */
     assert(!is_running_main(interp));
     assert(!_PyInterpreterState_IsRunningAllowed(interp));
+#endif
 
     // Destroy the interpreter.
     _PyXI_EndInterpreter(interp, NULL, NULL);

@@ -1896,7 +1896,9 @@ void
 _PyXI_EndInterpreter(PyInterpreterState *interp,
                      PyThreadState *tstate, PyThreadState **p_save_tstate)
 {
+#ifdef Py_GIL_DISABLED
     assert(!_PyInterpreterState_IsRunningAllowed(interp));
+#endif
 #ifndef NDEBUG
     long whence = _PyInterpreterState_GetWhence(interp);
 #endif