More CI fixes

Author: oremanj

tests/python/conftest.py

@@ -114,12 +114,6 @@ def skip(rel_id):
                 "test_base_events.py::BaseEventLoopWithSelectorTests::"
                 "test_log_slow_callbacks"
             )
-
-        if sys.version_info < (3, 12):
-            xfail(
-                "test_tasks.py::RunCoroutineThreadsafeTests::"
-                "test_run_coroutine_threadsafe_task_factory_exception"
-            )
         if sys.version_info >= (3, 8):
             xfail(
                 "test_tasks.py::RunCoroutineThreadsafeTests::"
@@ -192,3 +186,6 @@ def skip(rel_id):
             xfail("test_futures2.py::PyFutureTests::test_task_exc_handler_correct_context")
             xfail("test_futures2.py::CFutureTests::test_task_exc_handler_correct_context")
 
+            # This test assumes that get_event_loop_policy().get_event_loop() doesn't
+            # automatically return the running loop
+            skip("test_subprocess.py::GenericWatcherTests::test_create_subprocess_with_pidfd")

trio_asyncio/_loop.py

@@ -189,15 +189,16 @@ def set_event_loop(self, loop):
     __name__ = "asyncio.fake.trio_asyncio._loop"
 
 # Make sure we don't try to continue using the Trio loop after a fork()
-def _clear_state_after_fork():
-    if _in_trio_context():
-        from trio._core._run import GLOBAL_RUN_CONTEXT
+if hasattr(os, "register_at_fork"):
+    def _clear_state_after_fork():
+        if _in_trio_context():
+            from trio._core._run import GLOBAL_RUN_CONTEXT
 
-        del GLOBAL_RUN_CONTEXT.task
-        del GLOBAL_RUN_CONTEXT.runner
-        current_loop.set(None)
+            del GLOBAL_RUN_CONTEXT.task
+            del GLOBAL_RUN_CONTEXT.runner
+            current_loop.set(None)
 
-os.register_at_fork(after_in_child=_clear_state_after_fork)
+    os.register_at_fork(after_in_child=_clear_state_after_fork)
 
 from asyncio import events as _aio_event