Skip to content

Use correct python executable when running code using Python execution factory #17614

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
merged 2 commits into from
Oct 4, 2021
Merged

Use correct python executable when running code using Python execution factory #17614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
05e73a4
Use correct python executable when running code using Python executio…
Oct 4, 2021
77930ae
Add tests
Oct 4, 2021
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
2 changes: 1 addition & 1 deletion src/client/common/process/pythonExecutionFactory.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ export class PythonExecutionFactory implements IPythonExecutionFactory {
);
}
}
pythonPath = this.configService.getSettings(options.resource).pythonPath;
}
pythonPath = this.configService.getSettings(options.resource).pythonPath;
const processService: IProcessService = await this.processServiceFactory.create(options.resource);
processService.on('exec', this.logger.logProcess.bind(this.logger));

Expand Down
17 changes: 17 additions & 0 deletions src/test/common/process/pythonExecutionFactory.unit.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,23 @@ suite('Process - PythonExecutionFactory', () => {
verify(pythonSettings.pythonPath).once();
});

test('If interpreter is explicitly set, ensure we use it', async () => {
const pythonSettings = mock(PythonSettings);
when(processFactory.create(resource)).thenResolve(processService.object);
inDiscoveryExperimentStub.resolves(true);
when(activationHelper.getActivatedEnvironmentVariables(resource)).thenResolve({ x: '1' });
reset(interpreterPathExpHelper);
when(interpreterPathExpHelper.get(anything())).thenReturn('python');
when(autoSelection.autoSelectInterpreter(anything())).thenResolve();
when(configService.getSettings(resource)).thenReturn(instance(pythonSettings));

const service = await factory.create({ resource, pythonPath: 'HELLO' });

expect(service).to.not.equal(undefined);
verify(pyenvs.isWindowsStoreInterpreter('HELLO')).once();
verify(pythonSettings.pythonPath).never();
});

test('If no interpreter is explicitly set, ensure we autoselect before PythonExecutionService is created', async () => {
const pythonSettings = mock(PythonSettings);
when(processFactory.create(resource)).thenResolve(processService.object);
Expand Down