bug fix

Author: zixingdeng

pytest/src/testsolar_pytestx/conftest_generator.py

@@ -31,10 +31,21 @@
             initialize_header_injection,
             set_current_test_nodeid,
         )
+        from testsolar_pytestx.converter import normalize_testcase_name
 
         # 在模块导入时就初始化，确保在 httpx 被导入之前完成 patch
         initialize_header_injection()
 
+        def pytest_runtest_setup(item):
+            """在每个测试开始前设置 nodeid"""
+            testcase_name = normalize_testcase_name(item.nodeid)
+            testcase_class_name = testcase_name.split("?", 1)[-1]
+            set_current_test_nodeid(testcase_class_name)
+
+        def pytest_runtest_teardown(item):
+            """在每个测试结束后清除 nodeid"""
+            set_current_test_nodeid(None)
+
     except ImportError:
         # testsolar_pytestx 未安装，跳过
         pass

pytest/src/testsolar_pytestx/executor.py

@@ -37,7 +37,8 @@
 from .filter import filter_invalid_selector_path
 from .parser import parse_case_attributes
 from .stream import pytest_main_with_output
-from .header_injection import set_current_test_nodeid
+
+# from .header_injection import set_current_test_nodeid
 from .conftest_generator import generate_conftest_for_header_injection
 
 
@@ -77,9 +78,9 @@ def pytest_runtest_logstart(self, nodeid: str, location: Any) -> None:
         # 设置当前测试用例的nodeid到上下文
         # 注意：这里使用处理后的 testcase_class_name，与 conftest.py 中的格式可能不同
         # conftest.py 中使用原始 nodeid，这里使用处理后的名称
-        if should_enable_header_injection():
-            testcase_class_name = testcase_name.split("?", 1)[-1]
-            set_current_test_nodeid(testcase_class_name)
+        # if should_enable_header_injection():
+        #     testcase_class_name = testcase_name.split("?", 1)[-1]
+        #     set_current_test_nodeid(testcase_class_name)
 
         test_result = TestResult(
             Test=TestCase(Name=testcase_name),
@@ -226,8 +227,8 @@ def pytest_runtest_logfinish(self, nodeid: str, location: Any) -> None:
             self.testdata.pop(testcase_name, None)
 
         # 清除当前测试用例的nodeid
-        if should_enable_header_injection():
-            set_current_test_nodeid(None)
+        # if should_enable_header_injection():
+        #     set_current_test_nodeid(None)
 
         logger.info(f"E {nodeid} runtest_logfinish")