Clean up how the tests are run "run in process" Part 1: uniformity

Author: rwgk

tests/test_gil_scoped.py

@@ -7,55 +7,138 @@
 from pybind11_tests import gil_scoped as m
 
 
-def _run_in_process(target, *args, **kwargs):
-    """Runs target in process and returns its exitcode after 10s (None if still alive)."""
-    process = multiprocessing.Process(target=target, args=args, kwargs=kwargs)
-    process.daemon = True
-    try:
-        process.start()
-        # Do not need to wait much, 10s should be more than enough.
-        process.join(timeout=10)
-        return process.exitcode
-    finally:
-        if process.is_alive():
-            process.terminate()
+class ExtendedVirtClass(m.VirtClass):
+    def virtual_func(self):
+        pass
 
+    def pure_virtual_func(self):
+        pass
 
-def _python_to_cpp_to_python():
-    """Calls different C++ functions that come back to Python."""
 
-    class ExtendedVirtClass(m.VirtClass):
-        def virtual_func(self):
-            pass
+def test_callback_py_obj():
+    m.test_callback_py_obj(lambda: None)
 
-        def pure_virtual_func(self):
-            pass
 
-    extended = ExtendedVirtClass()
-    m.test_callback_py_obj(lambda: None)
+def test_callback_std_func():
     m.test_callback_std_func(lambda: None)
+
+
+def test_callback_virtual_func():
+    extended = ExtendedVirtClass()
     m.test_callback_virtual_func(extended)
+
+
+def test_callback_pure_virtual_func():
+    extended = ExtendedVirtClass()
     m.test_callback_pure_virtual_func(extended)
 
-    m.test_cross_module_gil_released()
-    m.test_cross_module_gil_acquired()
+
+def test_cross_module_gil_released():
+    """Makes sure that the GIL can be acquired by another module from a GIL-released state."""
+    m.test_cross_module_gil_released()  # Should not raise a SIGSEGV
+
+
+def test_cross_module_gil_acquired():
+    """Makes sure that the GIL can be acquired by another module from a GIL-acquired state."""
+    m.test_cross_module_gil_acquired()  # Should not raise a SIGSEGV
+
+
+def test_cross_module_gil_inner_custom_released():
+    """Makes sure that the GIL can be acquired/released by another module
+    from a GIL-released state using custom locking logic."""
     m.test_cross_module_gil_inner_custom_released()
+
+
+def test_cross_module_gil_inner_custom_acquired():
+    """Makes sure that the GIL can be acquired/acquired by another module
+    from a GIL-acquired state using custom locking logic."""
     m.test_cross_module_gil_inner_custom_acquired()
+
+
+def test_cross_module_gil_inner_pybind11_released():
+    """Makes sure that the GIL can be acquired/released by another module
+    from a GIL-released state using pybind11 locking logic."""
     m.test_cross_module_gil_inner_pybind11_released()
+
+
+def test_cross_module_gil_inner_pybind11_acquired():
+    """Makes sure that the GIL can be acquired/acquired by another module
+    from a GIL-acquired state using pybind11 locking logic."""
     m.test_cross_module_gil_inner_pybind11_acquired()
+
+
+def test_cross_module_gil_nested_custom_released():
+    """Makes sure that the GIL can be nested acquired/released by another module
+    from a GIL-released state using custom locking logic."""
     m.test_cross_module_gil_nested_custom_released()
+
+
+def test_cross_module_gil_nested_custom_acquired():
+    """Makes sure that the GIL can be nested acquired/acquired by another module
+    from a GIL-acquired state using custom locking logic."""
     m.test_cross_module_gil_nested_custom_acquired()
+
+
+def test_cross_module_gil_nested_pybind11_released():
+    """Makes sure that the GIL can be nested acquired/released by another module
+    from a GIL-released state using pybind11 locking logic."""
     m.test_cross_module_gil_nested_pybind11_released()
+
+
+def test_cross_module_gil_nested_pybind11_acquired():
+    """Makes sure that the GIL can be nested acquired/acquired by another module
+    from a GIL-acquired state using pybind11 locking logic."""
     m.test_cross_module_gil_nested_pybind11_acquired()
 
+
+def test_release_acquire():
     assert m.test_release_acquire(0xAB) == "171"
+
+
+def test_nested_acquire():
     assert m.test_nested_acquire(0xAB) == "171"
 
+
+def test_multi_acquire_release_cross_module():
     for bits in range(16 * 8):
         internals_ids = m.test_multi_acquire_release_cross_module(bits)
         assert len(internals_ids) == 2 if bits % 8 else 1
 
 
+def _python_to_cpp_to_python():
+    test_callback_py_obj()
+    test_callback_std_func()
+    test_callback_virtual_func()
+    test_callback_pure_virtual_func()
+    test_cross_module_gil_released()
+    test_cross_module_gil_acquired()
+    test_cross_module_gil_inner_custom_released()
+    test_cross_module_gil_inner_custom_acquired()
+    test_cross_module_gil_inner_pybind11_released()
+    test_cross_module_gil_inner_pybind11_acquired()
+    test_cross_module_gil_nested_custom_released()
+    test_cross_module_gil_nested_custom_acquired()
+    test_cross_module_gil_nested_pybind11_released()
+    test_cross_module_gil_nested_pybind11_acquired()
+    test_release_acquire()
+    test_nested_acquire()
+    test_multi_acquire_release_cross_module()
+
+
+def _run_in_process(target, *args, **kwargs):
+    """Runs target in process and returns its exitcode after 10s (None if still alive)."""
+    process = multiprocessing.Process(target=target, args=args, kwargs=kwargs)
+    process.daemon = True
+    try:
+        process.start()
+        # Do not need to wait much, 10s should be more than enough.
+        process.join(timeout=10)
+        return process.exitcode
+    finally:
+        if process.is_alive():
+            process.terminate()
+
+
 def _python_to_cpp_to_python_from_threads(num_threads, parallel=False):
     """Calls different C++ functions that come back to Python, from Python threads."""
     threads = []
@@ -113,75 +196,3 @@ def test_python_to_cpp_to_python_from_process():
     if exitcode is None and env.PYPY and env.WIN:  # Seems to be flaky.
         pytest.skip("Ignoring unexpected exitcode None (PYPY WIN)")
     assert exitcode == 0
-
-
-def test_cross_module_gil_released():
-    """Makes sure that the GIL can be acquired by another module from a GIL-released state."""
-    m.test_cross_module_gil_released()  # Should not raise a SIGSEGV
-
-
-def test_cross_module_gil_acquired():
-    """Makes sure that the GIL can be acquired by another module from a GIL-acquired state."""
-    m.test_cross_module_gil_acquired()  # Should not raise a SIGSEGV
-
-
-def test_cross_module_gil_inner_custom_released():
-    """Makes sure that the GIL can be acquired/released by another module
-    from a GIL-released state using custom locking logic."""
-    m.test_cross_module_gil_inner_custom_released()
-
-
-def test_cross_module_gil_inner_custom_acquired():
-    """Makes sure that the GIL can be acquired/acquired by another module
-    from a GIL-acquired state using custom locking logic."""
-    m.test_cross_module_gil_inner_custom_acquired()
-
-
-def test_cross_module_gil_inner_pybind11_released():
-    """Makes sure that the GIL can be acquired/released by another module
-    from a GIL-released state using pybind11 locking logic."""
-    m.test_cross_module_gil_inner_pybind11_released()
-
-
-def test_cross_module_gil_inner_pybind11_acquired():
-    """Makes sure that the GIL can be acquired/acquired by another module
-    from a GIL-acquired state using pybind11 locking logic."""
-    m.test_cross_module_gil_inner_pybind11_acquired()
-
-
-def test_cross_module_gil_nested_custom_released():
-    """Makes sure that the GIL can be nested acquired/released by another module
-    from a GIL-released state using custom locking logic."""
-    m.test_cross_module_gil_nested_custom_released()
-
-
-def test_cross_module_gil_nested_custom_acquired():
-    """Makes sure that the GIL can be nested acquired/acquired by another module
-    from a GIL-acquired state using custom locking logic."""
-    m.test_cross_module_gil_nested_custom_acquired()
-
-
-def test_cross_module_gil_nested_pybind11_released():
-    """Makes sure that the GIL can be nested acquired/released by another module
-    from a GIL-released state using pybind11 locking logic."""
-    m.test_cross_module_gil_nested_pybind11_released()
-
-
-def test_cross_module_gil_nested_pybind11_acquired():
-    """Makes sure that the GIL can be nested acquired/acquired by another module
-    from a GIL-acquired state using pybind11 locking logic."""
-    m.test_cross_module_gil_nested_pybind11_acquired()
-
-
-def test_release_acquire():
-    assert m.test_release_acquire(0xAB) == "171"
-
-
-def test_nested_acquire():
-    assert m.test_nested_acquire(0xAB) == "171"
-
-
-def test_multi_acquire_release_cross_module():
-    for bits in range(16 * 8):
-        internals_ids = m.test_multi_acquire_release_cross_module(bits)
-        assert len(internals_ids) == 2 if bits % 8 else 1