Merge pull request #107 from OpenTestSolar/bugfix/pytest-fix-parse-selector-bug

修复解析selector存在的bug

Author: dzx-cptbtptp

pytest/pyproject.toml

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

pytest/src/testsolar_pytestx/converter.py

@@ -11,21 +11,25 @@ def selector_to_pytest(test_selector: str) -> str:
     """translate from test selector format to pytest format"""
     path, _, testcase = test_selector.partition("?")
 
-    if not testcase:
+    if not testcase:  # tests/hello_test.py
         return path
 
     if "&" in testcase:
         testcase_attrs = testcase.split("&")
         for attr in testcase_attrs:
-            if "name=" in attr:
+            if "name=" in attr:  # tests/hello_test.py?name=xxxTest&tag=prod
                 testcase = attr[5:]
                 break
-            elif "=" not in attr:
+            elif "=" not in attr:  # tests/hello_test.py?xxxTest&
                 testcase = attr
                 break
+        else:  # tests/hello_test.py?test_hello_world&tag=prod
+            return path
     else:
-        if testcase.startswith("name="):
+        if testcase.startswith("name="):  # tests/hello_test.py?name=xxxTest
             testcase = testcase[5:]
+        elif "=" in testcase:  # tests/hello_test.py?tag=prod
+            return path
 
     case, datadrive = extract_case_and_datadrive(testcase)
 

pytest/tests/test_converter.py

@@ -18,6 +18,16 @@ def test_selector_to_pytest_without_datadrive(self):
         re = selector_to_pytest("/data/tests/tests/test_data_drive_zh_cn.py?aa/bb/test_include")
         self.assertEqual(re, "/data/tests/tests/test_data_drive_zh_cn.py::aa::bb::test_include")
 
+    def test_selector_to_pytest_with_tag(self):
+        re = selector_to_pytest("hello_test?tag=ready&tag=-skip")
+        self.assertEqual(re, "hello_test")
+        re = selector_to_pytest("hello_test?tag=ready")
+        self.assertEqual(re, "hello_test")
+        re = selector_to_pytest("hello_test?name=HelloTest&tag=ready")
+        self.assertEqual(re, "hello_test::HelloTest")
+        re = selector_to_pytest("hello_test?HelloTest&tag=ready")
+        self.assertEqual(re, "hello_test::HelloTest")
+
     def test_selector_to_pytest_with_datadrive(self):
         re = selector_to_pytest(
             "/data/tests/tests/test_data_drive_zh_cn.py?aa/bb/test_include/[#?/-#?^$%!]"

pytest/testtool.yaml

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