FIX tests reliying on child pid

Author: tomMoral

tests/test_resource_tracker.py

@@ -23,9 +23,9 @@ def _resource_unlink(name, rtype):
     resource_tracker._CLEANUP_FUNCS[rtype](name)
 
 
-def get_rtracker_pid():
+def get_rtracker_fd():
     resource_tracker.ensure_running()
-    return resource_tracker._resource_tracker._pid
+    return resource_tracker._resource_tracker._fd
 
 
 class TestResourceTracker:
@@ -40,12 +40,12 @@ def test_resource_utils(self, rtype):
         assert not resource_exists(name, rtype)
 
     def test_child_retrieves_resource_tracker(self):
-        parent_rtracker_pid = get_rtracker_pid()
+        parent_rtracker_fd = get_rtracker_fd()
         executor = ProcessPoolExecutor(max_workers=2)
-        child_rtracker_pid = executor.submit(get_rtracker_pid).result()
+        child_rtracker_fd = executor.submit(get_rtracker_fd).result()
 
-        # First simple pid retrieval check (see #200)
-        assert child_rtracker_pid == parent_rtracker_pid
+        # First simple fd retrieval check (see #200)
+        assert child_rtracker_fd == parent_rtracker_fd
 
         # Register a resource in the parent process, and un-register it in the
         # child process. If the two processes do not share the same
@@ -294,15 +294,12 @@ def test_loky_process_inherit_multiprocessing_resource_tracker(self):
         cmd = """if 1:
         from loky import get_reusable_executor
         from multiprocessing.shared_memory import SharedMemory
-        from multiprocessing.resource_tracker import (
-            _resource_tracker as mp_resource_tracker
-        )
 
-        def mp_rtracker_getattrs():
+        def mp_rtracker_getfd():
             from multiprocessing.resource_tracker import (
                 _resource_tracker as mp_resource_tracker
             )
-            return mp_resource_tracker._fd, mp_resource_tracker._pid
+            return mp_resource_tracker._fd
 
 
         if __name__ == '__main__':
@@ -312,9 +309,9 @@ def mp_rtracker_getattrs():
 
             # loky forces the creation of the resource tracker at process
             # creation so that loky processes can inherit its file descriptor.
-            fd, pid = executor.submit(mp_rtracker_getattrs).result()
-            assert fd == mp_resource_tracker._fd
-            assert pid == mp_resource_tracker._pid
+            parent_fd = mp_rtracker_getfd()
+            child_fd = executor.submit(mp_rtracker_getfd).result()
+            assert child_fd == parent_fd
 
             # non-regression test for #242: unlinking in a loky process a
             # shared_memory segment tracked by multiprocessing and created its
@@ -326,5 +323,5 @@ def mp_rtracker_getattrs():
         p = subprocess.run(
             [sys.executable, "-c", cmd], capture_output=True, text=True
         )
-        assert not p.stdout
-        assert not p.stderr
+        assert not p.stdout, p.stdout
+        assert not p.stderr, p.stderr