Skip to content

Fix defaultInterpreterPath variable expansion and stabilize interpreter selection tests #1234

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
karthiknadig merged 1 commit into from
Feb 14, 2026
+49 −1
Merged

Fix defaultInterpreterPath variable expansion and stabilize interpreter selection tests #1234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/features/interpreterSelection.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { commands, ConfigurationChangeEvent, Disposable, l10n, Uri } from 'vscod
import { PythonEnvironment, PythonEnvironmentApi } from '../api';
import { SYSTEM_MANAGER_ID, VENV_MANAGER_ID } from '../common/constants';
import { traceError, traceInfo, traceVerbose, traceWarn } from '../common/logging';
import { resolveVariables } from '../common/utils/internalVariables';
import { showWarningMessage } from '../common/window.apis';
import {
getConfiguration,
Expand Down Expand Up @@ -105,7 +106,8 @@ async function resolvePriorityChainCore(
// PRIORITY 3: User-configured python.defaultInterpreterPath
const userInterpreterPath = getUserConfiguredSetting<string>('python', 'defaultInterpreterPath', scope);
if (userInterpreterPath) {
const resolved = await tryResolveInterpreterPath(nativeFinder, api, userInterpreterPath, envManagers);
const expandedInterpreterPath = resolveVariables(userInterpreterPath, scope);
const resolved = await tryResolveInterpreterPath(nativeFinder, api, expandedInterpreterPath, envManagers);
if (resolved) {
traceVerbose(`${logPrefix} Priority 3: Using defaultInterpreterPath: ${userInterpreterPath}`);
return { result: resolved, errors };
Expand Down
46 changes: 46 additions & 0 deletions src/test/features/interpreterSelection.unit.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,7 @@ suite('Interpreter Selection - Priority Chain', () => {
// Setup: No pythonProjects[], no user-configured defaultEnvManager (returns undefined)
// But there IS a user-configured defaultInterpreterPath
sandbox.stub(workspaceApis, 'getConfiguration').returns(createMockConfig([]) as WorkspaceConfiguration);
sandbox.stub(workspaceApis, 'getWorkspaceFolders').returns([]);
sandbox.stub(helpers, 'getUserConfiguredSetting').callsFake((section: string, key: string) => {
if (section === 'python' && key === 'defaultInterpreterPath') {
return '/usr/bin/python3.11';
Expand All @@ -198,6 +199,7 @@ suite('Interpreter Selection - Priority Chain', () => {
suite('Priority 3: python.defaultInterpreterPath', () => {
test('should use defaultInterpreterPath when set and resolvable', async () => {
sandbox.stub(workspaceApis, 'getConfiguration').returns(createMockConfig([]) as WorkspaceConfiguration);
sandbox.stub(workspaceApis, 'getWorkspaceFolders').returns([]);
sandbox.stub(helpers, 'getUserConfiguredSetting').callsFake((section: string, key: string) => {
if (section === 'python' && key === 'defaultInterpreterPath') {
return '/usr/bin/python3.11';
Expand All @@ -220,8 +222,49 @@ suite('Interpreter Selection - Priority Chain', () => {
assert.strictEqual(result.environment.displayPath, '/usr/bin/python3.11');
});

test('should resolve ${workspaceFolder} in defaultInterpreterPath before native resolution', async () => {
const workspaceUri = Uri.file('/test/workspace');
const expandedInterpreterPath = '/test/workspace/backend/.venv/bin/python';
const workspaceFolder = { name: 'workspace', uri: workspaceUri } as WorkspaceFolder;

sandbox.stub(workspaceApis, 'getConfiguration').returns(createMockConfig([]) as WorkspaceConfiguration);
sandbox.stub(workspaceApis, 'getWorkspaceFolder').returns(workspaceFolder);
sandbox.stub(workspaceApis, 'getWorkspaceFolders').returns([workspaceFolder]);
sandbox.stub(helpers, 'getUserConfiguredSetting').callsFake((section: string, key: string) => {
if (section === 'python' && key === 'defaultInterpreterPath') {
return '${workspaceFolder}/backend/.venv/bin/python';
}
return undefined;
});
mockNativeFinder.resolve.resolves({
executable: expandedInterpreterPath,
version: '3.11.0',
prefix: '/test/workspace/backend/.venv',
});
mockApi.resolveEnvironment.resolves({
...mockVenvEnv,
displayPath: expandedInterpreterPath,
environmentPath: Uri.file(expandedInterpreterPath),
execInfo: { run: { executable: expandedInterpreterPath } },
});

const result = await resolveEnvironmentByPriority(
workspaceUri,
mockEnvManagers as unknown as EnvironmentManagers,
mockProjectManager as unknown as PythonProjectManager,
mockNativeFinder as unknown as NativePythonFinder,
mockApi as unknown as PythonEnvironmentApi,
);

assert.strictEqual(result.source, 'defaultInterpreterPath');
assert.ok(result.environment);
assert.strictEqual(result.environment.displayPath, expandedInterpreterPath);
assert.ok(mockNativeFinder.resolve.calledOnceWithExactly(expandedInterpreterPath));
});

test('should fall through to Priority 4 when defaultInterpreterPath cannot be resolved', async () => {
sandbox.stub(workspaceApis, 'getConfiguration').returns(createMockConfig([]) as WorkspaceConfiguration);
sandbox.stub(workspaceApis, 'getWorkspaceFolders').returns([]);
sandbox.stub(helpers, 'getUserConfiguredSetting').callsFake((section: string, key: string) => {
if (section === 'python' && key === 'defaultInterpreterPath') {
return '/nonexistent/python';
Expand Down Expand Up @@ -249,6 +292,7 @@ suite('Interpreter Selection - Priority Chain', () => {
const resolvedHomebrewPath = '/opt/homebrew/bin/python3';

sandbox.stub(workspaceApis, 'getConfiguration').returns(createMockConfig([]) as WorkspaceConfiguration);
sandbox.stub(workspaceApis, 'getWorkspaceFolders').returns([]);
sandbox.stub(helpers, 'getUserConfiguredSetting').callsFake((section: string, key: string) => {
if (section === 'python' && key === 'defaultInterpreterPath') {
return userPyenvPath;
Expand Down Expand Up @@ -371,6 +415,7 @@ suite('Interpreter Selection - Priority Chain', () => {
suite('Edge Cases', () => {
test('should fall through when nativeFinder resolves but returns no executable', async () => {
sandbox.stub(workspaceApis, 'getConfiguration').returns(createMockConfig([]) as WorkspaceConfiguration);
sandbox.stub(workspaceApis, 'getWorkspaceFolders').returns([]);
sandbox.stub(helpers, 'getUserConfiguredSetting').callsFake((section: string, key: string) => {
if (section === 'python' && key === 'defaultInterpreterPath') {
return '/some/path/python';
Expand All @@ -395,6 +440,7 @@ suite('Interpreter Selection - Priority Chain', () => {

test('should fall through when api.resolveEnvironment returns undefined', async () => {
sandbox.stub(workspaceApis, 'getConfiguration').returns(createMockConfig([]) as WorkspaceConfiguration);
sandbox.stub(workspaceApis, 'getWorkspaceFolders').returns([]);
sandbox.stub(helpers, 'getUserConfiguredSetting').callsFake((section: string, key: string) => {
if (section === 'python' && key === 'defaultInterpreterPath') {
return '/usr/bin/python3.11';
Expand Down
Loading