[None][refactor] Enhance pytest integration by updating test node generation to support fixture inheritance and dynamic collection (#15374)

Signed-off-by: yufeiwu-nv <230315618+yufeiwu-nv@users.noreply.github.com>

Author: yufeiwu-nv

tests/integration/defs/perf/utils.py

@@ -15,6 +15,7 @@
 import abc
 import contextlib
 import copy
+import inspect
 import io
 import os
 import re
@@ -27,8 +28,7 @@
 from pathlib import Path
 from typing import Dict, List, NamedTuple, Optional
 
-from _pytest.nodes import Item
-from _pytest.python import Function
+import pytest
 from defs.trt_test_alternative import print_error, print_info
 
 from ..common import get_trt_llm_lib_dir
@@ -798,51 +798,71 @@ def _write_result(self, full_test_name: str,
                            os.path.join(output_dir, yaml_name)))
 
 
-def generate_one_test_node(session, config, domain_name, test_name, test_func):
+def _find_collected_dir_node(items, rootpath):
+    """Return the real rootdir ``Dir`` collection node created by pytest.
+
+    Since pytest 9.1, fixture visibility is matched by the actual collection-node
+    hierarchy instead of the textual nodeid (pytest issue #11785). Dynamically
+    generated perf nodes must therefore descend from this real ``Dir`` node to
+    inherit the fixtures declared in ``conftest.py``.
+    """
+    for item in items:
+        node = item
+        while node is not None:
+            if isinstance(node, pytest.Dir) and node.path == rootpath:
+                return node
+            node = node.parent
+    return None
+
+
+def generate_one_test_node(session,
+                           config,
+                           domain_name,
+                           test_name,
+                           test_func,
+                           parent_dir=None,
+                           module_cache=None):
     """
     A helper function to create a PyTest item with the specific name and specific test function.
     """
 
-    # Create the parent Item node.
-    # Pytest 8.x upgrade compatibility.
-    # We should never import Pytest internals within test-definitions.
+    # Attach the node under the real Dir -> Module hierarchy so it inherits the
+    # fixtures declared in conftest.py. Since pytest 9.1 fixture visibility is
+    # matched by the collection-node hierarchy rather than the textual nodeid
+    # (pytest issue #11785), a node attached directly to the session can no longer
+    # resolve those fixtures. The legacy nodeid is restored afterwards so that
+    # test-list filtering and --test-prefix rewriting keep working unchanged.
+    if parent_dir is not None:
+        if module_cache is None:
+            module_cache = {}
+        module_path = Path(inspect.getfile(test_func)).resolve()
+        module = module_cache.get(module_path)
+        if module is None:
+            module = pytest.Module.from_parent(parent_dir, path=module_path)
+            module_cache[module_path] = module
+        item = pytest.Function.from_parent(module,
+                                           name=test_name,
+                                           callobj=test_func)
+        item.obj = test_func
+        item._nodeid = f"{domain_name}::{test_name}"
+        return item
+
+    # Fallback when no collected Dir node is available (e.g. nothing was collected
+    # before the dynamic generation): mirror the legacy session-attached behavior.
     # TODO: TRT-23565
-    parent = None
-    if hasattr(Item, "from_parent"):
-
-        class TrtexecItem(Item):
-
-            def __init__(self, **kwargs):
-                super().__init__(**kwargs)
+    class TrtexecItem(pytest.Item):
 
-            def runtest(self):
-                return test_func()
-
-        parent = TrtexecItem.from_parent(session,
-                                         name=domain_name,
-                                         nodeid=domain_name)
-    else:
-        parent = Item(name=domain_name,
-                      parent=session,
-                      config=config,
-                      session=session,
-                      nodeid=domain_name)
+        def runtest(self):
+            return test_func()
 
+    parent = TrtexecItem.from_parent(session,
+                                     name=domain_name,
+                                     nodeid=domain_name)
     parent.obj = None
 
-    # Create the Function node for the test.
-    # For pytest 8.x compatibility
-    # TODO: TRT-23565
-    item = None
-    if hasattr(Function, "from_parent"):
-        item = Function.from_parent(parent, name=test_name, callobj=test_func)
-    else:
-        item = Function(name=test_name,
-                        parent=parent,
-                        config=config,
-                        session=session,
-                        callobj=test_func)
-
+    item = pytest.Function.from_parent(parent,
+                                       name=test_name,
+                                       callobj=test_func)
     item.obj = test_func
 
     # This has to be set but can be random as it isn't used.
@@ -869,6 +889,12 @@ def generate_test_nodes(session, config, items, valid_prefixes: List[str],
     except FileNotFoundError:
         pass
 
+    # Reuse the real rootdir Dir node that pytest created during collection so the
+    # generated nodes inherit conftest fixtures (see generate_one_test_node). The
+    # module node is created once and shared across all generated cases.
+    parent_dir = _find_collected_dir_node(items, config.rootpath)
+    module_cache = {}
+
     # Go through all test names and find the ones that need to be generated.
     for test_name in all_tests:
 
@@ -882,7 +908,8 @@ def generate_test_nodes(session, config, items, valid_prefixes: List[str],
             # Generate the test node and append it to the Pytest item list.
             items.append(
                 generate_one_test_node(session, config, domain_name,
-                                       short_test_name, test_func))
+                                       short_test_name, test_func, parent_dir,
+                                       module_cache))
             print(f"Dynamically generated test node: {test_name}")
 
     return items