fixes

Author: eleanorjboyd

python_files/vscode_pytest/__init__.py

@@ -207,7 +207,7 @@ def pytest_exception_interact(node, call, report):
             send_execution_message(
                 os.fsdecode(cwd),
                 "success",
-                collected_test if collected_test else None,
+                collected_test or None,
             )
 
 
@@ -331,7 +331,7 @@ def pytest_report_teststatus(report, config):  # noqa: ARG001
             send_execution_message(
                 os.fsdecode(cwd),
                 "success",
-                collected_test if collected_test else None,
+                collected_test or None,
             )
     yield
 
@@ -365,7 +365,7 @@ def pytest_runtest_protocol(item, nextitem):  # noqa: ARG001
             send_execution_message(
                 os.fsdecode(cwd),
                 "success",
-                collected_test if collected_test else None,
+                collected_test or None,
             )
     yield
 
@@ -852,10 +852,7 @@ def create_session_node(session: pytest.Session) -> TestNode:
     session -- the pytest session.
     """
     # Use PROJECT_ROOT_PATH if set (project-based testing), otherwise use session path (legacy)
-    if PROJECT_ROOT_PATH:
-        node_path = pathlib.Path(PROJECT_ROOT_PATH)
-    else:
-        node_path = get_node_path(session)
+    node_path = pathlib.Path(PROJECT_ROOT_PATH) if PROJECT_ROOT_PATH else get_node_path(session)
     return {
         "name": node_path.name,
         "path": node_path,
@@ -1047,7 +1044,7 @@ def get_node_path(
         except Exception as e:
             raise VSCodePytestError(
                 f"Error occurred while calculating symlink equivalent from node path: {e}"
-                f"\n SYMLINK_PATH: {SYMLINK_PATH}, \n node path: {node_path}, \n cwd: {_CACHED_CWD if _CACHED_CWD else pathlib.Path.cwd()}"
+                f"\n SYMLINK_PATH: {SYMLINK_PATH}, \n node path: {node_path}, \n cwd: {_CACHED_CWD or pathlib.Path.cwd()}"
             ) from e
     else:
         result = node_path

src/client/pythonEnvironments/base/locators/common/nativePythonFinder.ts

@@ -521,6 +521,9 @@ export function getNativePythonFinder(context?: IExtensionContext): NativePython
             },
         };
     }
+    if (_finder && isFinderDisposed(_finder)) {
+        _finder = undefined;
+    }
     if (!_finder) {
         const cacheDirectory = context ? getCacheDirectory(context) : undefined;
         _finder = new NativePythonFinderImpl(cacheDirectory, context);
@@ -531,6 +534,10 @@ export function getNativePythonFinder(context?: IExtensionContext): NativePython
     return _finder;
 }
 
+function isFinderDisposed(finder: NativePythonFinder): boolean {
+    return 'isDisposed' in finder && Boolean((finder as { isDisposed?: boolean }).isDisposed);
+}
+
 export function getCacheDirectory(context: IExtensionContext): Uri {
     return Uri.joinPath(context.globalStorageUri, 'pythonLocator');
 }