Merge pull request #95 from OpenTestSolar/dev/do-not-sort-load-result

取消对加载结果的排序

Author: dzx-cptbtptp

pytest/requirements.txt

@@ -1,4 +1,5 @@
-# This file was autogenerated via `uv export`.
+# This file was autogenerated by uv via the following command:
+#    uv export --no-hashes --no-dev --locked
 colorama==0.4.6 ; sys_platform == 'win32'
 coverage==7.2.7
 dacite==1.8.1

pytest/src/testsolar_pytestx/collector.py

@@ -138,7 +138,6 @@ def collect_testcases(
     # 增加额外功能，方便外部接入
     if extra_load_function:
         extra_load_function(entry_param.ProjectPath, load_result, case_drive_records)
-    load_result.Tests.sort(key=lambda x: x.Name)
 
     for k, v in my_plugin.errors.items():
         load_result.LoadErrors.append(
@@ -148,8 +147,6 @@ def collect_testcases(
             )
         )
 
-    load_result.LoadErrors.sort(key=lambda x: x.name)
-
     print(f"[Load] collect testcase count: {len(load_result.Tests)}")
     print(f"[Load] collect load error count: {len(load_result.LoadErrors)}")
 

pytest/tests/test_collector.py

@@ -35,7 +35,8 @@ def test_collect_testcases_when_selector_is_valid(self):
 
         self.assertEqual(len(re.Tests), 6)
         self.assertEqual(len(re.LoadErrors), 2)
-
+        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")
@@ -80,7 +81,8 @@ def test_collect_testcases_when_select_not_valid(self):
         pipe_io.seek(0)
 
         re = read_load_result(pipe_io)
-
+        re.Tests.sort(key=lambda x: x.Name)
+        re.LoadErrors.sort(key=lambda x: x.name)
         self.assertEqual(len(re.Tests), 4)
         self.assertEqual(len(re.LoadErrors), 1)
         self.assertIn("test_not_exist.py does not exist, SKIP it", re.LoadErrors[0].message)
@@ -100,7 +102,8 @@ def test_collect_testcases_with_utf8_chars(self):
         pipe_io.seek(0)
 
         re = read_load_result(pipe_io)
-
+        re.Tests.sort(key=lambda x: x.Name)
+        re.LoadErrors.sort(key=lambda x: x.name)
         self.assertEqual(len(re.Tests), 3)
         self.assertEqual(len(re.LoadErrors), 0)
 
@@ -139,7 +142,8 @@ def loader_extend(param_1: str, param_2: LoadResult, param_3: Dict[str, List[str
         pipe_io.seek(0)
 
         re = read_load_result(pipe_io)
-
+        re.Tests.sort(key=lambda x: x.Name)
+        re.LoadErrors.sort(key=lambda x: x.name)
         self.assertEqual(len(re.Tests), 1)
         self.assertEqual(len(re.LoadErrors), 0)
 
@@ -169,7 +173,8 @@ def test_collect_testcases_when_testcase_not_exist(self):
         pipe_io.seek(0)
 
         re = read_load_result(pipe_io)
-
+        re.Tests.sort(key=lambda x: x.Name)
+        re.LoadErrors.sort(key=lambda x: x.name)
         self.assertEqual(len(re.LoadErrors), 1)
 
         self.assertEqual(
@@ -193,7 +198,8 @@ def test_collect_testcases_with_skipp_error(self):
         pipe_io.seek(0)
 
         re = read_load_result(pipe_io)
-
+        re.Tests.sort(key=lambda x: x.Name)
+        re.LoadErrors.sort(key=lambda x: x.name)
         self.assertEqual(len(re.Tests), 3)
         self.assertEqual(len(re.LoadErrors), 1)
 
@@ -212,7 +218,8 @@ def test_collect_testcases_with_emoji(self):
         pipe_io.seek(0)
 
         re = read_load_result(pipe_io)
-
+        re.Tests.sort(key=lambda x: x.Name)
+        re.LoadErrors.sort(key=lambda x: x.name)
         self.assertEqual(len(re.Tests), 1)
         self.assertEqual(len(re.LoadErrors), 0)
         self.assertEqual(

pytest/tests/test_load.py

@@ -20,7 +20,8 @@ def test_collect_testcases_from_args(self):
 
         pipe_io.seek(0)
         re = read_load_result(pipe_io)
-
+        re.Tests.sort(key=lambda x: x.Name)
+        re.LoadErrors.sort(key=lambda x: x.name)
         self.assertEqual(len(re.Tests), 7)
         self.assertEqual(
             re.Tests[4].Name,

pytest/testtool.yaml

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