移除url编码逻辑

Author: zixingdeng

pytest/pyproject.toml

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

pytest/src/testsolar_pytestx/converter.py

@@ -1,7 +1,6 @@
 import re
 import os
 from typing import Tuple, Optional
-from urllib.parse import quote
 from pytest import Item
 from loguru import logger
 
@@ -79,14 +78,14 @@ def pytest_to_selector(item: Item, project_path: str) -> str:
         if item.cls:
             name = item.cls.__name__ + "/" + name
         name = decode_datadrive(name)
-        full_name = f"{rel_path}?{quote(name)}"
+        full_name = f"{rel_path}?{name}"
     elif hasattr(item, "nodeid") and item.nodeid:
         full_name = normalize_testcase_name(item.nodeid)
     else:
         rel_path, _, name = item.location
         name = name.replace(".", "/")
         name = decode_datadrive(name)
-        full_name = f"{rel_path}?{quote(name)}"
+        full_name = f"{rel_path}?{name}"
 
     return full_name
 
@@ -146,5 +145,5 @@ def normalize_testcase_name(name: str, sub_case_key: Optional[str] = None) -> st
     if "?" in name:
         path = name.split("?", 1)[0]
         case_name = name.split("?", 1)[-1]
-        return "?".join([path, quote(case_name)])
+        return "?".join([path, case_name])
     return name

pytest/src/testsolar_pytestx/executor.py

@@ -4,7 +4,7 @@
 from typing import BinaryIO, Optional, Dict, Any, List, Callable
 
 from loguru import logger
-from pytest import CallInfo, Item, Session
+from pytest import Item, Session
 
 try:
     from pytest import TestReport
@@ -17,8 +17,6 @@
     TestResult,
     ResultType,
     TestCaseStep,
-    TestCaseLog,
-    LogLevel,
 )
 from testsolar_testtool_sdk.reporter import Reporter
 from enum import Enum
@@ -104,29 +102,6 @@ def _get_result_type_by_report(self, report: TestReport) -> ResultType:
             result_type = ResultType.FAILED
         return result_type
 
-    def pytest_runtest_makereport(self, item: Item, call: CallInfo[Any]) -> None:
-        if call.excinfo is not None:
-            logger.info(f"S {item.nodeid} log exec info")
-            testcase_name = normalize_testcase_name(item.nodeid, self.data_drive_key)
-            test_result = self.testdata[testcase_name]
-            test_result.Steps.append(
-                TestCaseStep(
-                    Title="exec failed",
-                    Logs=[
-                        TestCaseLog(
-                            Time=datetime.utcnow(),
-                            Level=LogLevel.ERROR,
-                            Content=f"{call.excinfo.typename}: {call.excinfo.value}",
-                        )
-                    ],
-                    StartTime=datetime.utcnow(),
-                    EndTime=datetime.utcnow(),
-                    ResultType=ResultType.FAILED,
-                )
-            )
-            test_result.ResultType = ResultType.FAILED
-            logger.info(f"E {item.nodeid} log exec info")
-
     def pytest_runtest_logreport(self, report: TestReport) -> None:
         """
         Process the TestReport produced for each of the setup, call and teardown runtest phases of an item.

pytest/src/testsolar_pytestx/parser.py

@@ -41,7 +41,7 @@ def parse_case_attributes(item: Item, comment_fields: Optional[List[str]] = None
                 extra_attr[key] = mark.args[0][key]
                 attr_list.append(extra_attr)
             attributes["extra_attributes"] = json.dumps(attr_list)
-    attributes["tags"] = json.dumps(tags)    
+    attributes["tags"] = json.dumps(tags)
     return attributes
 
 

pytest/tests/test_collector.py

@@ -38,12 +38,12 @@ def test_collect_testcases_when_selector_is_valid(self):
         re.Tests.sort(key=lambda x: x.Name)
         re.LoadErrors.sort(key=lambda x: x.name)
         self.assertEqual(re.Tests[0].Name, "aa/bb/cc/test_in_sub_class.py?TestCompute/test_add")
-        self.assertEqual(re.Tests[1].Name, "test_data_drive.py?test_eval/%5B2%2B4-6%5D")
-        self.assertEqual(re.Tests[2].Name, "test_data_drive.py?test_eval/%5B3%2B5-8%5D")
-        self.assertEqual(re.Tests[3].Name, "test_data_drive.py?test_eval/%5B6%2A9-42%5D")
+        self.assertEqual(re.Tests[1].Name, "test_data_drive.py?test_eval/[2+4-6]")
+        self.assertEqual(re.Tests[2].Name, "test_data_drive.py?test_eval/[3+5-8]")
+        self.assertEqual(re.Tests[3].Name, "test_data_drive.py?test_eval/[6*9-42]")
         self.assertEqual(
             re.Tests[4].Name,
-            "test_data_drive.py?test_special_data_drive_name/%5B%E4%B8%AD%E6%96%87-%E5%88%86%E5%8F%B7%2B%5Bid%3A32%5D%5D",
+            "test_data_drive.py?test_special_data_drive_name/[中文-分号+[id:32]]",
         )
 
         self.assertEqual(re.Tests[5].Name, "test_normal_case.py?test_success")
@@ -107,15 +107,15 @@ def test_collect_testcases_with_utf8_chars(self):
 
         self.assertEqual(
             re.Tests[0].Name,
-            "test_data_drive_zh_cn.py?test_include/%5B%23%3F-%23%3F%5E%24%25%21/%5D",
+            "test_data_drive_zh_cn.py?test_include/[#?-#?^$%!/]",
         )
         self.assertEqual(
             re.Tests[1].Name,
-            "test_data_drive_zh_cn.py?test_include/%5B%E4%B8%AD%E6%96%87-%E4%B8%AD%E6%96%87%E6%B1%89%E5%AD%97%5D",
+            "test_data_drive_zh_cn.py?test_include/[中文-中文汉字]",
         )
         self.assertEqual(
             re.Tests[2].Name,
-            "test_data_drive_zh_cn.py?test_include/%5B%ED%8C%8C%EC%9D%BC%EC%9D%84%20%EC%B0%BE%EC%9D%84%20%EC%88%98%20%EC%97%86%EC%8A%B5%EB%8B%88%EB%8B%A4-%E3%83%95%E3%82%A1%E3%82%A4%E3%83%AB%E3%81%8C%E8%A6%8B%E3%81%A4%E3%81%8B%E3%82%8A%E3%81%BE%E3%81%9B%E3%82%93%5D",
+            "test_data_drive_zh_cn.py?test_include/[파일을 찾을 수 없습니다-ファイルが見つかりません]",
         )
 
     def test_collect_testcases_with_case_drive_separator(self):
@@ -222,5 +222,5 @@ def test_collect_testcases_with_emoji(self):
         self.assertEqual(len(re.LoadErrors), 0)
         self.assertEqual(
             re.Tests[0].Name,
-            "test_emoji_data_drive.py?test_emoji_data_drive_name/%5B%F0%9F%98%84%5D",
+            "test_emoji_data_drive.py?test_emoji_data_drive_name/[😄]",
         )

pytest/tests/test_converter.py

@@ -70,7 +70,7 @@ def test_pytest_path_cls_to_selector(self):
 
         re = pytest_to_selector(mock, "/data/tests/")
 
-        self.assertEqual(re, "tests/test_data_drive_zh_cn.py?InnerClass/test_include/%5B2-8%5D")
+        self.assertEqual(re, "tests/test_data_drive_zh_cn.py?InnerClass/test_include/[2-8]")
 
     def test_pytest_node_id_to_selector_without_datadrive(self):
         mock = MagicMock()
@@ -92,7 +92,7 @@ def test_pytest_node_id_to_selector_with_datadrive(self):
 
         self.assertEqual(
             re,
-            "/data/tests/tests/test_data_drive_zh_cn.py?test_include/%5B%23%3F-/%5B%E4%B8%AD%E6%96%87%3A203%5D%5D",
+            "/data/tests/tests/test_data_drive_zh_cn.py?test_include/[#?-/[中文:203]]",
         )
 
     def test_pytest_location_to_selector(self):
@@ -104,7 +104,7 @@ def test_pytest_location_to_selector(self):
 
         re = pytest_to_selector(mock, "/data/tests/")
 
-        self.assertEqual(re, "tests/test_data_drive_zh_cn.py?test_include/%5BAA-BB%5D")
+        self.assertEqual(re, "tests/test_data_drive_zh_cn.py?test_include/[AA-BB]")
 
 
 class TestExtractCaseAndDataDrive:

pytest/tests/test_executor.py

@@ -143,14 +143,14 @@ def test_run_failed_testcase_with_log(self):
 
         end = read_test_result(pipe_io)
         self.assertEqual(end.ResultType, ResultType.FAILED)
-        self.assertEqual(len(end.Steps), 4)
+        self.assertEqual(len(end.Steps), 3)
         self.assertIn("testdata/test_normal_case.py", end.Message)
 
-        step3 = end.Steps[2]
-        self.assertEqual(len(step3.Logs), 1)
-        self.assertEqual(step3.Logs[0].Level, LogLevel.ERROR)
-        self.assertEqual(step3.ResultType, ResultType.FAILED)
-        self.assertIn("E       assert 4 == 6", step3.Logs[0].Content)
+        step2 = end.Steps[1]
+        self.assertEqual(len(step2.Logs), 1)
+        self.assertEqual(step2.Logs[0].Level, LogLevel.ERROR)
+        self.assertEqual(step2.ResultType, ResultType.FAILED)
+        self.assertIn("E       assert 4 == 6", step2.Logs[0].Content)
 
     def test_run_failed_testcase_with_raise_error(self):
         entry = EntryParam(
@@ -171,13 +171,13 @@ def test_run_failed_testcase_with_raise_error(self):
 
         end = read_test_result(pipe_io)
         self.assertEqual(end.ResultType, ResultType.FAILED)
-        self.assertEqual(len(end.Steps), 4)
+        self.assertEqual(len(end.Steps), 3)
 
-        step3 = end.Steps[2]
-        self.assertEqual(len(step3.Logs), 1)
-        self.assertEqual(step3.Logs[0].Level, LogLevel.ERROR)
-        self.assertEqual(step3.ResultType, ResultType.FAILED)
-        self.assertIn("E       RuntimeError: this is raise runtime error", step3.Logs[0].Content)
+        step2 = end.Steps[1]
+        self.assertEqual(len(step2.Logs), 1)
+        self.assertEqual(step2.Logs[0].Level, LogLevel.ERROR)
+        self.assertEqual(step2.ResultType, ResultType.FAILED)
+        self.assertIn("E       RuntimeError: this is raise runtime error", step2.Logs[0].Content)
 
     def test_run_skipped_testcase(self):
         entry = EntryParam(
@@ -198,7 +198,7 @@ def test_run_skipped_testcase(self):
 
         end = read_test_result(pipe_io)
         self.assertEqual(end.ResultType, ResultType.IGNORED)
-        self.assertEqual(len(end.Steps), 3)
+        self.assertEqual(len(end.Steps), 2)
         self.assertEqual(end.Message, "Skipped: no way of currently testing this")
 
     def test_run_datadrive_with_single_value(self):
@@ -296,6 +296,6 @@ def test_run_testcase_with_emoji_data_drive(self):
         start = read_test_result(pipe_io)
         self.assertEqual(
             start.Test.Name,
-            "test_emoji_data_drive.py?test_emoji_data_drive_name/%5B%F0%9F%98%84%5D",
+            "test_emoji_data_drive.py?test_emoji_data_drive_name/[😄]",
         )
         self.assertEqual(start.ResultType, ResultType.RUNNING)

pytest/tests/test_load.py

@@ -25,7 +25,7 @@ def test_collect_testcases_from_args(self):
         self.assertEqual(len(re.Tests), 7)
         self.assertEqual(
             re.Tests[4].Name,
-            "test_data_drive.py?test_special_data_drive_name/%5B%E4%B8%AD%E6%96%87-%E5%88%86%E5%8F%B7%2B%5Bid%3A32%5D%5D",
+            "test_data_drive.py?test_special_data_drive_name/[中文-分号+[id:32]]",
         )
         self.assertEqual(
             re.Tests[6].Name,

pytest/tests/test_run_allure.py

@@ -11,8 +11,8 @@
 )
 from testsolar_testtool_sdk.pipe_reader import read_test_result
 
-from run import run_testcases_from_args
-from testsolar_pytestx.extend.allure_extend import (
+from src.run import run_testcases_from_args
+from src.testsolar_pytestx.extend.allure_extend import (
     generate_allure_results,
     gen_allure_step_info,
     format_allure_time,
@@ -112,12 +112,12 @@ def test_run_testcases_from_args(self):
         pipe_io.seek(0)
         start = read_test_result(pipe_io)
         self.assertEqual(start.ResultType, ResultType.RUNNING)
-        self.assertEqual(start.Test.Name, "allure/allure_step_test.py?test_step/%5Bdata0%5D")
+        self.assertEqual(start.Test.Name, "allure/allure_step_test.py?test_step/[data0]")
 
         # testcase finish
         stop = read_test_result(pipe_io)
         self.assertEqual(stop.ResultType, ResultType.SUCCEED)
-        self.assertEqual(stop.Test.Name, "allure/allure_step_test.py?test_step/%5Bdata0%5D")
+        self.assertEqual(stop.Test.Name, "allure/allure_step_test.py?test_step/[data0]")
         self.assertEqual(stop.Message, "")
         self.assertEqual(type(stop.Steps), list)
-        self.assertEqual(len(stop.Steps), 3)
+        self.assertEqual(len(stop.Steps), 6)

pytest/testtool.yaml

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