Merge remote-tracking branch 'upstream/main' into bad-raven

# Conflicts:
#	python_files/vscode_pytest/__init__.py
#	src/client/testing/testController/common/testDiscoveryHandler.ts
#	src/test/testing/testController/common/testDiscoveryHandler.unit.test.ts

Author: eleanorjboyd

.github/commands.json

@@ -153,5 +153,14 @@
 		"addLabel": "info-needed",
 		"removeLabel": "~confirmation-needed",
 		"comment": "Please diagnose the root cause of the issue by running the command `F1 > Help: Troubleshoot Issue` and following the instructions. Once you have done that, please update the issue with the results.\n\nHappy Coding!"
+	},
+    {
+		"type": "label",
+		"name": "~spam",
+		"removeLabel": "~spam",
+		"addLabel": "spam",
+		"action": "close",
+		"reason": "not_planned",
+		"comment": "Thank you for your submission. This issue has been closed as it doesn't meet our community guidelines or appears to be spam.\n\n**If you believe this was closed in error:**\n- Please review our [Code of Conduct](https://opensource.microsoft.com/codeofconduct/)\n- Ensure your issue contains a clear description of the problem or feature request\n- Feel free to open a new issue with appropriate detail if this was a legitimate concern\n\n**For legitimate issues, please include:**\n- Clear description of the problem\n- Steps to reproduce (for bugs)\n- Expected vs actual behavior\n- VS Code version and environment details\n\nThank you for helping us maintain a welcoming and productive community."
 	}
 ]

.github/workflows/lock-issues.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: 'Lock Issues'
-        uses: dessant/lock-threads@7266a7ce5c1df01b1c6db85bf8cd86c737dadbe7 # v6.0.0
+        uses: dessant/lock-threads@89ae32b08ed1a541efecbab17912962a5e38981c # v6.0.2
         with:
           github-token: ${{ github.token }}
           issue-inactive-days: '30'

package-lock.json

@@ -1723,7 +1723,7 @@
         "semver": "^7.5.2",
         "stack-trace": "0.0.10",
         "sudo-prompt": "^9.2.1",
-        "tmp": "^0.2.5",
+        "tmp": "^0.2.7",
         "uint64be": "^3.0.0",
         "unicode": "^14.0.0",
         "vscode-debugprotocol": "^1.28.0",

package.json

@@ -63,10 +63,21 @@ class TestItem(TestData):
 class TestNode(TestData):
     """A general class that handles all test data which contains children."""
 
-    children: list[TestNode | TestItem | None]
+    children: Children
     lineno: NotRequired[str]  # Optional field for class/function nodes
 
 
+class Children:
+    def __init__(self, init=None):
+        self._children = dict(init) if init is not None else {}
+
+    def add(self, child: TestNode | TestItem):
+        self._children[child["id_"]] = child
+
+    def values(self):
+        return list(self._children.values())
+
+
 class VSCodePytestError(Exception):
     """A custom exception class for pytest errors."""
 
@@ -441,7 +452,7 @@ def pytest_sessionfinish(session, exitstatus):
                 "name": "",
                 "path": test_root_path,
                 "type_": "error",
-                "children": [],
+                "children": Children(),
                 "id_": "",
             }
             send_discovery_message(os.fsdecode(test_root_path), error_node)
@@ -461,7 +472,7 @@ def pytest_sessionfinish(session, exitstatus):
                 "name": "",
                 "path": test_root_path,
                 "type_": "error",
-                "children": [],
+                "children": Children(),
                 "id_": "",
             }
             send_discovery_message(os.fsdecode(test_root_path), error_node)
@@ -666,8 +677,7 @@ def process_parameterized_test(
         )
         function_nodes_dict[parent_id] = function_test_node
 
-    if test_node not in function_test_node["children"]:
-        function_test_node["children"].append(test_node)
+    function_test_node["children"].add(test_node)
 
     # Check if the parent node of the function is file, if so create/add to this file node.
     if isinstance(test_case.parent, pytest.File):
@@ -678,8 +688,7 @@ def process_parameterized_test(
         if parent_test_case is None:
             parent_test_case = create_file_node(parent_path)
             file_nodes_dict[parent_path_key] = parent_test_case
-        if function_test_node not in parent_test_case["children"]:
-            parent_test_case["children"].append(function_test_node)
+        parent_test_case["children"].add(function_test_node)
 
     # Return the function node as the test node to handle subsequent nesting
     return function_test_node
@@ -728,8 +737,7 @@ def build_test_tree(session: pytest.Session) -> TestNode:
                     test_class_node = create_class_node(case_iter)
                     class_nodes_dict[case_iter.nodeid] = test_class_node
                 # Check if the class already has the child node. This will occur if the test is parameterized.
-                if node_child_iter not in test_class_node["children"]:
-                    test_class_node["children"].append(node_child_iter)
+                test_class_node["children"].add(node_child_iter)
                 # Iterate up.
                 node_child_iter = test_class_node
                 case_iter = case_iter.parent
@@ -747,8 +755,8 @@ def build_test_tree(session: pytest.Session) -> TestNode:
                 test_file_node = create_file_node(parent_path)
                 file_nodes_dict[parent_path_key] = test_file_node
             # Check if the class is already a child of the file node.
-            if test_class_node is not None and test_class_node not in test_file_node["children"]:
-                test_file_node["children"].append(test_class_node)
+            if test_class_node is not None:
+                test_file_node["children"].add(test_class_node)
         elif not hasattr(test_case, "callspec"):
             # This includes test cases that are pytest functions or a doctests.
             if test_case.parent is None:
@@ -765,12 +773,13 @@ def build_test_tree(session: pytest.Session) -> TestNode:
             if parent_test_case is None:
                 parent_test_case = create_file_node(parent_path)
                 file_nodes_dict[parent_path_key] = parent_test_case
-            parent_test_case["children"].append(test_node)
+            parent_test_case["children"].add(test_node)
     # Process all files and construct them into nested folders
     session_children_dict = construct_nested_folders(
         file_nodes_dict, session_node, session_children_dict
     )
-    session_node["children"] = list(session_children_dict.values())
+    session_node["children"] = Children(session_children_dict)
+
     return session_node
 
 
@@ -810,8 +819,7 @@ def build_nested_folders(
         if curr_folder_node is None:
             curr_folder_node = create_folder_node(curr_folder_name, iterator_path)
             created_files_folders_dict[iterator_path_key] = curr_folder_node
-        if prev_folder_node not in curr_folder_node["children"]:
-            curr_folder_node["children"].append(prev_folder_node)
+        curr_folder_node["children"].add(prev_folder_node)
         iterator_path = iterator_path.parent
         prev_folder_node = curr_folder_node
         # Handles error where infinite loop occurs.
@@ -860,7 +868,7 @@ def create_session_node(session: pytest.Session) -> TestNode:
         "name": node_path.name,
         "path": node_path,
         "type_": "folder",
-        "children": [],
+        "children": Children(),
         "id_": os.fspath(node_path),
     }
 
@@ -887,7 +895,7 @@ def create_class_node(class_module: Any) -> TestNode:
         "name": class_module.name,
         "path": get_node_path(class_module),
         "type_": "class",
-        "children": [],
+        "children": Children(),
         "id_": get_absolute_test_id(class_module.nodeid, get_node_path(class_module)),
         "lineno": class_line,
     }
@@ -908,7 +916,7 @@ def create_parameterized_function_node(
         "name": function_name,
         "path": test_path,
         "type_": "function",
-        "children": [],
+        "children": Children(),
         "id_": function_id,
     }
 
@@ -924,7 +932,7 @@ def create_file_node(calculated_node_path: pathlib.Path) -> TestNode:
         "path": calculated_node_path,
         "type_": "file",
         "id_": os.fspath(calculated_node_path),
-        "children": [],
+        "children": Children(),
     }
 
 
@@ -940,7 +948,7 @@ def create_folder_node(folder_name: str, path_iterator: pathlib.Path) -> TestNod
         "path": path_iterator,
         "type_": "folder",
         "id_": os.fspath(path_iterator),
-        "children": [],
+        "children": Children(),
     }
 
 

python_files/vscode_pytest/__init__.py

@@ -8,9 +8,9 @@ microvenv==2025.0 \
     --hash=sha256:568155ec18af01c89f270d35d123ab803b09672b480c3702d15fd69e9cc5bd1e \
     --hash=sha256:8a2568a8390a4ffb5af2f05e7642454e03b887e582d192b6316326974eab5d0f
     # via -r requirements.in
-packaging==26.1 \
-    --hash=sha256:5d9c0669c6285e491e0ced2eee587eaf67b670d94a19e94e3984a481aba6802f \
-    --hash=sha256:f042152b681c4bfac5cae2742a55e103d27ab2ec0f3d88037136b6bfe7c9c5de
+packaging==26.2 \
+    --hash=sha256:5fc45236b9446107ff2415ce77c807cee2862cb6fac22b8a73826d0693b0980e \
+    --hash=sha256:ff452ff5a3e828ce110190feff1178bb1f2ea2281fa2075aadb987c2fb221661
     # via -r requirements.in
 tomli==2.4.1 \
     --hash=sha256:01f520d4f53ef97964a240a035ec2a869fe1a37dde002b57ebc4417a27ccd853 \

requirements.txt

@@ -17,13 +17,18 @@ const MEMENTO_KEY = 'userSelectedEnvPath';
 @injectable()
 export class RecommendedEnvironmentService implements IRecommendedEnvironmentService, IExtensionActivationService {
     private api?: PythonExtension['environments'];
+    private hasRegisteredCommand = false;
     constructor(@inject(IExtensionContext) private readonly extensionContext: IExtensionContext) {}
     supportedWorkspaceTypes: { untrustedWorkspace: boolean; virtualWorkspace: boolean } = {
         untrustedWorkspace: true,
         virtualWorkspace: false,
     };
 
     async activate(_resource: Resource, _startupStopWatch?: StopWatch): Promise<void> {
+        if (this.hasRegisteredCommand) {
+            return;
+        }
+        this.hasRegisteredCommand = true;
         this.extensionContext.subscriptions.push(
             commands.registerCommand('python.getRecommendedEnvironment', async (resource: Resource) => {
                 return this.getRecommededEnvironment(resource);

src/client/interpreter/configuration/recommededEnvironmentService.ts

@@ -48,6 +48,7 @@ export enum EventName {
     UNITTEST_DISCOVERY_DONE = 'UNITTEST.DISCOVERY.DONE',
     UNITTEST_RUN_STOP = 'UNITTEST.RUN.STOP',
     UNITTEST_RUN = 'UNITTEST.RUN',
+    UNITTEST_RUN_DONE = 'UNITTEST.RUN.DONE',
     UNITTEST_RUN_ALL_FAILED = 'UNITTEST.RUN_ALL_FAILED',
     UNITTEST_DISABLED = 'UNITTEST.DISABLED',
 
@@ -101,6 +102,17 @@ export enum EventName {
     ENVIRONMENT_TERMINAL_GLOBAL_PIP = 'ENVIRONMENT.TERMINAL.GLOBAL_PIP',
 }
 
+export const UNITTEST_RUN_FAILURE_CATEGORIES = [
+    'pipe-cancelled',
+    'subprocess-crash',
+    'no-results',
+    'env-mismatch',
+    'cancelled',
+    'unknown',
+] as const;
+
+export type UnitTestRunFailureCategory = typeof UNITTEST_RUN_FAILURE_CATEGORIES[number];
+
 export enum PlatformErrors {
     FailedToParseVersion = 'FailedToParseVersion',
     FailedToDetermineOS = 'FailedToDetermineOS',