修复上报的时区为utcnow (#72)

Author: asiazhang

pytest/pyproject.toml

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

pytest/src/testsolar_pytestx/case_log.py

@@ -26,7 +26,7 @@ def gen_logs(report: TestReport) -> TestCaseLog:
             log += error_log
 
     return TestCaseLog(
-        Time=datetime.now() - timedelta(report.duration),
+        Time=datetime.utcnow() - timedelta(report.duration),
         Level=LogLevel.ERROR if report.failed else LogLevel.INFO,
         Content=log,
     )

pytest/src/testsolar_pytestx/executor.py

@@ -133,7 +133,7 @@ def pytest_runtest_logstart(self, nodeid: str, location: Any) -> None:
         test_result = TestResult(
             Test=TestCase(Name=testcase_name),
             ResultType=ResultType.RUNNING,
-            StartTime=datetime.now(),
+            StartTime=datetime.utcnow(),
             Message="",
         )
 
@@ -163,7 +163,7 @@ def pytest_runtest_logreport(self, report: TestReport) -> None:
         testcase_name = normalize_testcase_name(report.nodeid, self.data_drive_key)
         test_result = self.testdata[testcase_name]
 
-        step_end_time = datetime.now()
+        step_end_time = datetime.utcnow()
 
         result_type: ResultType
         if report.failed:
@@ -178,7 +178,7 @@ def pytest_runtest_logreport(self, report: TestReport) -> None:
                 TestCaseStep(
                     Title="Setup",
                     Logs=[gen_logs(report)],
-                    StartTime=step_end_time - timedelta(report.duration),
+                    StartTime=step_end_time - timedelta(seconds=report.duration),
                     EndTime=step_end_time,
                     ResultType=result_type,
                 )
@@ -198,7 +198,7 @@ def pytest_runtest_logreport(self, report: TestReport) -> None:
                 TestCaseStep(
                     Title="Run TestCase",
                     Logs=[gen_logs(report)],
-                    StartTime=step_end_time - timedelta(report.duration),
+                    StartTime=step_end_time - timedelta(seconds=report.duration),
                     EndTime=step_end_time,
                     ResultType=result_type,
                 )
@@ -237,7 +237,7 @@ def pytest_runtest_logfinish(self, nodeid: str, location: Any) -> None:
         testcase_name = normalize_testcase_name(nodeid, self.data_drive_key)
 
         test_result = self.testdata[testcase_name]
-        test_result.EndTime = datetime.now()
+        test_result.EndTime = datetime.utcnow()
 
         # 检查是否allure报告，如果是在统一生成json文件后再上报
         enable_allure = check_allure_enable()

pytest/src/testsolar_pytestx/ini_fixer.py

@@ -42,9 +42,14 @@ def remove_conflict(ini_file: Path, backup_file: Path) -> bool:
         config = configparser.ConfigParser()
         config.read(ini_file)
 
-        if "pytest" in config and "addopts" in config["pytest"]:
-            logger.info("removing addopts in pytest.ini")
-            del config["pytest"]["addopts"]
+        if "pytest" in config:
+            if "addopts" in config["pytest"]:
+                logger.info("removing addopts in pytest.ini")
+                del config["pytest"]["addopts"]
+            # 如果用户重设置了错误的testpaths，也需要去除
+            if "testpaths" in config["pytest"]:
+                logger.info("removing testpaths in pytest.ini")
+                del config["pytest"]["testpaths"]
 
             shutil.copyfile(str(ini_file), str(backup_file))
 

pytest/tests/test_executor.py

@@ -1,5 +1,6 @@
 import io
 import unittest
+from datetime import datetime, timedelta
 from pathlib import Path
 
 from testsolar_testtool_sdk.model.param import EntryParam
@@ -9,6 +10,11 @@
 from testsolar_pytestx.executor import run_testcases
 
 
+def convert_to_datetime(raw: str) -> datetime:
+    dt = datetime.strptime(raw, "%Y-%m-%dT%H:%M:%S.%fZ")
+    return dt
+
+
 class ExecutorTest(unittest.TestCase):
     testdata_dir = Path(__file__).parent.parent.absolute().joinpath("testdata")
 
@@ -22,6 +28,8 @@ def test_run_success_testcase_with_logs(self):
             FileReportPath="",
         )
 
+        current_time = datetime.utcnow()
+
         pipe_io = io.BytesIO()
         run_testcases(entry, pipe_io)
         pipe_io.seek(0)
@@ -33,8 +41,16 @@ def test_run_success_testcase_with_logs(self):
         self.assertEqual(end.Test.Name, "test_normal_case.py?test_success")
         self.assertEqual(end.Test.Attributes["tag"], "high")
         self.assertEqual(end.Test.Attributes["owner"], "foo")
+        elapse: timedelta = convert_to_datetime(str(end.StartTime)) - current_time
+        self.assertLess(elapse.total_seconds(), 1)
+        elapse_end: timedelta = convert_to_datetime(str(end.EndTime)) - current_time
+        self.assertLess(elapse_end.total_seconds(), 1)
         self.assertEqual(end.ResultType, ResultType.SUCCEED)
         self.assertEqual(len(end.Steps), 3)
+        elapse = current_time - convert_to_datetime(str(end.Steps[0].StartTime))
+        self.assertLess(elapse.total_seconds(), 1)
+        elapse = current_time - convert_to_datetime(str(end.Steps[0].EndTime))
+        self.assertLess(elapse.total_seconds(), 1)
 
         step1 = end.Steps[0]
         self.assertEqual(step1.Title, "Setup")

pytest/tests/test_run_allure.py

@@ -1,18 +1,18 @@
 import io
 import os
-import pytest
+from datetime import datetime
 from pathlib import Path
 from unittest import TestCase
 from unittest.mock import patch, mock_open
-from datetime import datetime
 
-from testsolar_testtool_sdk.pipe_reader import read_test_result
+import pytest
 from testsolar_testtool_sdk.model.test import TestCase as TestSolar_TestCase
 from testsolar_testtool_sdk.model.testresult import (
     TestResult,
-    ResultType,
 )
+from testsolar_testtool_sdk.pipe_reader import read_test_result
 
+from run import run_testcases_from_args
 from testsolar_pytestx.extend.allure_extend import (
     generate_allure_results,
     gen_allure_step_info,
@@ -21,9 +21,6 @@
     Step,
 )
 
-from run import run_testcases_from_args
-
-
 allure_json = """
 {
   "name": "test_case_1",

pytest/testtool.yaml

@@ -2,7 +2,7 @@ schemaVersion: 1.0
 name: pytest
 nameZh: pytest自动化测试
 lang: python
-version: '0.1.24'
+version: '0.1.25'
 langType: INTERPRETED
 description: |-
   pytest是一个成熟的全功能Python测试工具，可以帮助您编写更好的程序。此测试工具允许您在TestSolar上运行pytest。