fix:修复空变量 (#71)

* 修复空变量

* 新增版本

* 增加用例

* fix

Author: ambzhang

pytest/pyproject.toml

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

pytest/src/testsolar_pytestx/extend/allure_extend.py

@@ -77,6 +77,7 @@ def generate_allure_results(test_data: Dict[str, TestResult], file_name: str) ->
         allure_data = from_dict(data_class=AllureData, data=json.loads(fp.read()))
         full_name = allure_data.fullName.replace("#", ".")
         for testcase_name in test_data.keys():
+            step_info: List[TestCaseStep] = []
             testcase_format_name = ".".join(
                 testcase_name.replace(".py?", os.sep).split(os.sep)
             )

pytest/tests/test_run_allure.py

@@ -1,14 +1,132 @@
 import io
 import os
+import pytest
 from pathlib import Path
 from unittest import TestCase
+from unittest.mock import patch, mock_open
+from datetime import datetime
 
-from testsolar_testtool_sdk.model.testresult import ResultType
 from testsolar_testtool_sdk.pipe_reader import read_test_result
+from testsolar_testtool_sdk.model.test import TestCase as TestSolar_TestCase
+from testsolar_testtool_sdk.model.testresult import (
+    TestResult,
+    ResultType,
+)
+
+from testsolar_pytestx.extend.allure_extend import (
+    generate_allure_results,
+    gen_allure_step_info,
+    format_allure_time,
+    ResultType,
+    Step,
+)
 
 from run import run_testcases_from_args
 
 
+allure_json = """
+{
+  "name": "test_case_1",
+  "status": "passed",
+  "start": 1622547800000,
+  "stop": 1622547900000,
+  "uuid": "12345",
+  "historyId": "67890",
+  "testCaseId": "abcde",
+  "fullName": "test_module.test_case_1",
+  "steps": [
+    {
+      "name": "step1",
+      "status": "passed",
+      "start": 1622547800000,
+      "stop": 1622547810000,
+      "parameters": [],
+      "steps": [],
+      "statusDetails": null
+    },
+    {
+      "name": "step2",
+      "status": "skipped",
+      "start": 1622547800000,
+      "stop": 1622547810000,
+      "parameters": [],
+      "steps": [],
+      "statusDetails": null
+    },
+    {
+      "name": "step3",
+      "status": "failed",
+      "start": 1622547800000,
+      "stop": 1622547810000,
+      "parameters": [],
+      "steps": [],
+      "statusDetails": 
+        {
+          "message": "step3 failed",
+          "trace": "trace info"
+        }
+    }
+  ],
+  "labels": []
+}
+"""
+
+
+@pytest.fixture
+def test_data():
+    return {
+        "test_module.test_case_1": TestResult(
+            Test=TestSolar_TestCase(Name="test_module.test_case_1", Attributes={}),
+            StartTime=datetime.now(),
+            ResultType=ResultType.SUCCEED,
+            Message="",
+            Steps=[],
+        ),
+        "test_module.test_case_2": TestResult(
+            Test=TestSolar_TestCase(Name="test_module.test_case_2", Attributes={}),
+            StartTime=datetime.now(),
+            ResultType=ResultType.SUCCEED,
+            Message="",
+            Steps=[],
+        ),
+    }
+
+
+class TestAllureResults:
+    def test_generate_allure_results(self, test_data):
+        with patch("builtins.open", mock_open(read_data=allure_json)):
+            generate_allure_results(test_data, "dummy_file.json")
+
+        assert len(test_data["test_module.test_case_1"].Steps) == 3
+        assert test_data["test_module.test_case_1"].Steps[0].Title == "1: step1"
+        assert (
+            test_data["test_module.test_case_1"].Steps[0].ResultType
+            == ResultType.SUCCEED
+        )
+
+    def test_gen_allure_step_info(self):
+        steps = [
+            Step(
+                name="step1",
+                status="passed",
+                start=1622547800000,
+                stop=1622547810000,
+                parameters=[],
+                steps=[],
+                statusDetails=None,
+            )
+        ]
+        result = gen_allure_step_info(steps)
+        assert len(result) == 1
+        assert result[0].Title == "1: step1"
+        assert result[0].ResultType == ResultType.SUCCEED
+
+    def test_format_allure_time(self):
+        timestamp = 1622547800000
+        result = format_allure_time(timestamp)
+        assert result == datetime.fromtimestamp(timestamp / 1000)
+
+
 class TestExecuteEntry(TestCase):
     testdata_dir: str = str(
         Path(__file__).parent.parent.absolute().joinpath("testdata")

pytest/testtool.yaml

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