From 6c1dbf63eb70b94afefb95e1ddfd3705192fcd01 Mon Sep 17 00:00:00 2001 From: "vs-code-engineering[bot]" Date: Mon, 28 Sep 2026 20:37:37 +0000 Subject: [PATCH 1/2] [cherry-pick] release: Prevent virtualenv redirect from occupying .venv --- .../base/locators/common/nativePythonFinder.ts | 1 - src/test/pythonEnvironments/nativePythonFinder.unit.test.ts | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/client/pythonEnvironments/base/locators/common/nativePythonFinder.ts b/src/client/pythonEnvironments/base/locators/common/nativePythonFinder.ts index ea0d63cd7552..7d0f7d103d76 100644 --- a/src/client/pythonEnvironments/base/locators/common/nativePythonFinder.ts +++ b/src/client/pythonEnvironments/base/locators/common/nativePythonFinder.ts @@ -120,7 +120,6 @@ class NativePythonFinderImpl extends DisposableBase implements NativePythonFinde ? getGlobalStorage(this.context, DONT_SHOW_SPAWN_ERROR_AGAIN, false) : ({ get: () => false, set: async () => {} } as IPersistentStorage); this.connection = this.start(); - void this.configure(); this.firstRefreshResults = this.refreshFirstTime(); } diff --git a/src/test/pythonEnvironments/nativePythonFinder.unit.test.ts b/src/test/pythonEnvironments/nativePythonFinder.unit.test.ts index b6182da8111f..597b99ecd0ea 100644 --- a/src/test/pythonEnvironments/nativePythonFinder.unit.test.ts +++ b/src/test/pythonEnvironments/nativePythonFinder.unit.test.ts @@ -21,10 +21,11 @@ suite('Native Python Finder', () => { let getConfigurationStub: sinon.SinonStub; let configMock: typemoq.IMock; let getWorkspaceFolderPathsStub: sinon.SinonStub; + const locatorOutput = new MockOutputChannel('locator'); setup(() => { createLogOutputChannelStub = sinon.stub(windowsApis, 'createLogOutputChannel'); - createLogOutputChannelStub.returns(new MockOutputChannel('locator')); + createLogOutputChannelStub.returns(locatorOutput); getWorkspaceFolderPathsStub = sinon.stub(workspaceApis, 'getWorkspaceFolderPaths'); getWorkspaceFolderPathsStub.returns([]); @@ -55,7 +56,7 @@ suite('Native Python Finder', () => { } // typically all test envs should have at least one environment - assert.isNotEmpty(envs); + assert.isNotEmpty(envs, `Python Locator output:\n${locatorOutput.output || '(none)'}`); }); test('Resolve should return python environments with version', async () => { From ab66ba765d351e719de6d79bad54b1947645829c Mon Sep 17 00:00:00 2001 From: Michael Lively Date: Tue, 29 Sep 2026 15:05:29 -0700 Subject: [PATCH 2/2] chore: sign commit Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>