Merge pull request #111 from OpenTestSolar/feat/refactor-reporter-implementation

feat(reporter): refactor reporter implementation to use FileReporter

Author: dzx-cptbtptp

pytest/.gitignore

@@ -161,4 +161,5 @@ cython_debug/
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
 .idea/
 
-testdata/allure_results/*
+testdata/allure_results/*.vscode/
+.vscode/

pytest/CHANGELOG.md

@@ -0,0 +1,15 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+### Changed
+- Update file reporting mode in run script
+- Refactor reporter implementation to use FileReporter instead of Reporter
+
+### Fixed
+- Improve test case collection and execution with better file handling

pytest/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "testsolar-pytestx"
-version = "0.1.56"
+version = "0.1.58"
 description = "Pytest tool for TestSolar"
 authors = [
     {name = "asiazhang2002", email = "asiazhang2002@gmail.com"},

pytest/script/linux/run.sh

@@ -10,4 +10,4 @@ export PYTHONUNBUFFERED=1
 export TESTSOLAR_TTP_LOADINSUBPROC=1 # 隔离环境
 
 /usr/local/bin/testtools_sdk version
-/usr/local/bin/testtools_sdk serve --tool pytest
+/usr/local/bin/testtools_sdk serve --tool pytest --file-report-mode

pytest/src/testsolar_pytestx/collector.py

@@ -15,7 +15,7 @@
 from testsolar_testtool_sdk.model.load import LoadResult, LoadError
 from testsolar_testtool_sdk.model.param import EntryParam
 from testsolar_testtool_sdk.model.test import TestCase
-from testsolar_testtool_sdk.reporter import Reporter
+from testsolar_testtool_sdk.reporter import BaseReporter, FileReporter
 
 from .converter import selector_to_pytest, pytest_to_selector, CASE_DRIVE_SEPARATOR
 from .filter import filter_invalid_selector_path
@@ -25,10 +25,10 @@
 
 
 class PytestCollector:
-    def __init__(self, pipe_io: Optional[BinaryIO] = None):
+    def __init__(self, report_file_path: Path):
         self.collected: List[Item] = []
         self.errors: Dict[str, str] = {}
-        self.reporter: Reporter = Reporter(pipe_io=pipe_io)
+        self.reporter: BaseReporter = FileReporter(report_file_path)
 
     def pytest_collection_modifyitems(self, items: Sequence[Union[Item, Collector]]) -> None:
         for item in items:
@@ -105,7 +105,7 @@ def collect_testcases(
 
     testcase_list = [os.path.join(entry_param.ProjectPath, it) for it in pytest_paths if it]
 
-    my_plugin = PytestCollector(pipe_io)
+    my_plugin = PytestCollector(Path(entry_param.FileReportPath))
     args = [
         f"--rootdir={entry_param.ProjectPath}",
         "--collect-only",
@@ -150,7 +150,7 @@ def collect_testcases(
     print(f"[Load] collect testcase count: {len(load_result.Tests)}")
     print(f"[Load] collect load error count: {len(load_result.LoadErrors)}")
 
-    reporter = Reporter(pipe_io=pipe_io)
+    reporter = FileReporter(Path(entry_param.FileReportPath))
     reporter.report_load_result(load_result)
 
 

pytest/src/testsolar_pytestx/converter.py

@@ -78,6 +78,8 @@ def pytest_to_selector(item: Item, project_path: str) -> str:
 
     if hasattr(item, "path") and hasattr(item, "cls") and item.path:
         rel_path = os.path.relpath(item.path, project_path)
+        # 统一使用正斜杠，确保跨平台一致性
+        rel_path = rel_path.replace(os.sep, "/")
         name = item.name
         if item.cls:
             name = item.cls.__name__ + "/" + name
@@ -87,6 +89,8 @@ def pytest_to_selector(item: Item, project_path: str) -> str:
         full_name = normalize_testcase_name(item.nodeid)
     else:
         rel_path, _, name = item.location
+        # 统一使用正斜杠，确保跨平台一致性
+        rel_path = rel_path.replace(os.sep, "/")
         name = name.replace(".", "/")
         name = decode_datadrive(name)
         full_name = f"{rel_path}?{name}"
@@ -140,6 +144,8 @@ def normalize_testcase_name(name: str, sub_case_key: Optional[str] = None) -> st
     -> test_directory/test_module.py?TestExampleClass/test_example_function/[datedrive]
     """
     assert "::" in name
+    # 统一使用正斜杠，确保跨平台一致性
+    name = name.replace(os.sep, "/")
     name = name.replace("::", "?", 1).replace(  # 第一个分割符是文件，因此替换为?
         "::", "/"
     )  # 后续的分割符是测试用例名称，替换为/

pytest/src/testsolar_pytestx/executor.py

@@ -1,4 +1,5 @@
 import os
+from pathlib import Path
 import sys
 from datetime import datetime, timedelta
 from typing import BinaryIO, Optional, Dict, Any, List, Callable
@@ -18,7 +19,7 @@
     ResultType,
     TestCaseStep,
 )
-from testsolar_testtool_sdk.reporter import Reporter
+from testsolar_testtool_sdk.reporter import BaseReporter, FileReporter
 from enum import Enum
 
 from .case_log import gen_logs
@@ -46,11 +47,11 @@ class RunMode(Enum):
 class PytestExecutor:
     def __init__(
         self,
-        reporter: Reporter,
+        reporter: BaseReporter,
         comment_fields: Optional[List[str]] = None,
         data_drive_key: Optional[str] = None,
     ) -> None:
-        self.reporter: Reporter = reporter
+        self.reporter: BaseReporter = reporter
         self.testcase_count = 0
         self.testdata: Dict[str, TestResult] = {}
         self.skipped_testcase: Dict[str, str] = {}
@@ -265,7 +266,7 @@ def run_testcases(
 
     append_extra_args(args)
 
-    reporter: Reporter = Reporter(pipe_io=pipe_io)
+    reporter: BaseReporter = FileReporter(report_path=Path(entry.FileReportPath))
     exit_code = 0
     captured_stderr = ""
     if run_mode == RunMode.SINGLE:

pytest/src/testsolar_pytestx/parser.py

@@ -46,7 +46,7 @@ def parse_case_attributes(item: Item, comment_fields: Optional[List[str]] = None
             for data_name in mark.args[0]:
                 if data_name == case_data_name:
                     attributes["coding_testcase_id"] = mark.args[0][data_name]
-                
+
     attributes["tags"] = json.dumps(tags)
     return attributes