testing logging

Author: eleanorjboyd

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

@@ -114,6 +114,16 @@ class NativePythonFinderImpl extends DisposableBase implements NativePythonFinde
 
     private readonly suppressErrorNotification: IPersistentStorage<boolean>;
 
+    /**
+     * Tracks whether the internal JSON-RPC connection has been closed.
+     * This can happen independently of the finder being disposed.
+     */
+    private _connectionClosed = false;
+
+    public get isConnectionClosed(): boolean {
+        return this._connectionClosed;
+    }
+
     constructor(private readonly cacheDirectory?: Uri, private readonly context?: IExtensionContext) {
         super();
         this.suppressErrorNotification = this.context
@@ -135,14 +145,21 @@ class NativePythonFinderImpl extends DisposableBase implements NativePythonFinde
     }
 
     async *refresh(options?: NativePythonEnvironmentKind | Uri[]): AsyncIterable<NativeEnvInfo> {
+        this.outputChannel.info(
+            `refresh() called: firstRefreshResults=${!!this.firstRefreshResults}, connectionClosed=${
+                this._connectionClosed
+            }, isDisposed=${this.isDisposed}`,
+        );
         if (this.firstRefreshResults) {
             // If this is the first time we are refreshing,
             // Then get the results from the first refresh.
             // Those would have started earlier and cached in memory.
+            this.outputChannel.info('Using firstRefreshResults');
             const results = this.firstRefreshResults();
             this.firstRefreshResults = undefined;
             yield* results;
         } else {
+            this.outputChannel.info('Calling doRefresh');
             const result = this.doRefresh(options);
             let completed = false;
             void result.completed.finally(() => {
@@ -298,6 +315,8 @@ class NativePythonFinderImpl extends DisposableBase implements NativePythonFinde
                 sendNativeTelemetry(data, this.initialRefreshMetrics),
             ),
             connection.onClose(() => {
+                this.outputChannel.info('JSON-RPC connection closed, marking connection as closed');
+                this._connectionClosed = true;
                 disposables.forEach((d) => d.dispose());
             }),
         );
@@ -535,7 +554,15 @@ export function getNativePythonFinder(context?: IExtensionContext): NativePython
 }
 
 function isFinderDisposed(finder: NativePythonFinder): boolean {
-    return 'isDisposed' in finder && Boolean((finder as { isDisposed?: boolean }).isDisposed);
+    const finderImpl = finder as { isDisposed?: boolean; isConnectionClosed?: boolean };
+    const disposed = Boolean(finderImpl.isDisposed);
+    const connectionClosed = Boolean(finderImpl.isConnectionClosed);
+    if (disposed || connectionClosed) {
+        traceError(
+            `[NativePythonFinder] Finder needs recreation: isDisposed=${disposed}, isConnectionClosed=${connectionClosed}`,
+        );
+    }
+    return disposed || connectionClosed;
 }
 
 export function getCacheDirectory(context: IExtensionContext): Uri {
@@ -546,3 +573,14 @@ export async function clearCacheDirectory(context: IExtensionContext): Promise<v
     const cacheDirectory = getCacheDirectory(context);
     await fs.emptyDir(cacheDirectory.fsPath).catch(noop);
 }
+
+/**
+ * Clears the singleton finder instance. For testing purposes only.
+ * @internal
+ */
+export function clearNativePythonFinder(): void {
+    if (_finder) {
+        _finder.dispose();
+        _finder = undefined;
+    }
+}

src/test/pythonEnvironments/nativePythonFinder.unit.test.ts

@@ -6,6 +6,7 @@ import * as sinon from 'sinon';
 import * as typemoq from 'typemoq';
 import { WorkspaceConfiguration } from 'vscode';
 import {
+    clearNativePythonFinder,
     getNativePythonFinder,
     isNativeEnvInfo,
     NativeEnvInfo,
@@ -23,6 +24,9 @@ suite('Native Python Finder', () => {
     let getWorkspaceFolderPathsStub: sinon.SinonStub;
 
     setup(() => {
+        // Clear singleton before each test to ensure fresh state
+        clearNativePythonFinder();
+
         createLogOutputChannelStub = sinon.stub(windowsApis, 'createLogOutputChannel');
         createLogOutputChannelStub.returns(new MockOutputChannel('locator'));
 
@@ -41,11 +45,14 @@ suite('Native Python Finder', () => {
     });
 
     teardown(() => {
+        // Clean up finder before restoring stubs to avoid issues with mock references
+        clearNativePythonFinder();
         sinon.restore();
     });
 
     suiteTeardown(() => {
-        finder.dispose();
+        // Final cleanup (finder may already be disposed by teardown)
+        clearNativePythonFinder();
     });
 
     test('Refresh should return python environments', async () => {