fix bug which merges all parametrize test classes (#21542)

fixes #21541

Author: eleanorjboyd

pythonFiles/tests/pytestadapter/.data/parametrize_tests.py

@@ -8,3 +8,10 @@
 )
 def test_adding(actual, expected):
     assert eval(actual) == expected
+
+
+# Testing pytest with parametrized tests. All three pass.
+# The tests ids are parametrize_tests.py::test_under_ten[1] and so on.
+@pytest.mark.parametrize("num", range(1, 3))  # test_marker--test_under_ten
+def test_under_ten(num):
+    assert num < 10

pythonFiles/tests/pytestadapter/expected_discovery_test_output.py

@@ -438,6 +438,30 @@
                         },
                     ],
                 },
+                {
+                    "name": "test_under_ten",
+                    "path": parameterize_tests_path,
+                    "type_": "function",
+                    "children": [
+                        {
+                            "name": "[1]",
+                            "path": parameterize_tests_path,
+                            "lineno": "15",
+                            "type_": "test",
+                            "id_": "parametrize_tests.py::test_under_ten[1]",
+                            "runID": "parametrize_tests.py::test_under_ten[1]",
+                        },
+                        {
+                            "name": "[2]",
+                            "path": parameterize_tests_path,
+                            "lineno": "15",
+                            "type_": "test",
+                            "id_": "parametrize_tests.py::test_under_ten[2]",
+                            "runID": "parametrize_tests.py::test_under_ten[2]",
+                        },
+                    ],
+                    "id_": "parametrize_tests.py::test_under_ten",
+                },
             ],
         },
     ],

pythonFiles/vscode_pytest/__init__.py

@@ -290,7 +290,7 @@ def build_test_tree(session: pytest.Session) -> TestNode:
             # parameterized test cases cut the repetitive part of the name off.
             name_split = test_node["name"].split("[")
             test_node["name"] = "[" + name_split[1]
-            parent_path = os.fspath(test_case.path)
+            parent_path = os.fspath(test_case.path) + "::" + name_split[0]
             try:
                 function_name = test_case.originalname  # type: ignore
                 function_test_case = function_nodes_dict[parent_path]