Skip to content

Register conda service to resolve DS functional tests #9002

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
Rich Chiodo (rchiodo) merged 3 commits into from
Dec 12, 2019
Merged

Register conda service to resolve DS functional tests #9002

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0d3f6f6
Register conda service
DonJayamanne Dec 10, 2019
7718acd
Use conda only when using jupyter
DonJayamanne Dec 11, 2019
dc7cb73
Oops
DonJayamanne Dec 11, 2019
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
14 changes: 8 additions & 6 deletions src/test/datascience/dataScienceIocContainer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,7 @@ import { PythonInterpreterLocatorService } from '../../client/interpreter/locato
import { InterpreterLocatorHelper } from '../../client/interpreter/locators/helpers';
import { CondaEnvFileService } from '../../client/interpreter/locators/services/condaEnvFileService';
import { CondaEnvService } from '../../client/interpreter/locators/services/condaEnvService';
import { CondaService } from '../../client/interpreter/locators/services/condaService';
import {
CurrentPathService,
PythonInPathCommandProvider
Expand Down Expand Up @@ -539,7 +540,6 @@ export class DataScienceIocContainer extends UnitTestIocContainer {
this.serviceManager.addSingletonInstance<ICommandManager>(ICommandManager, this.commandManager);

// Also setup a mock execution service and interpreter service
const condaService = TypeMoq.Mock.ofType<ICondaService>();
const appShell = this.applicationShell = TypeMoq.Mock.ofType<IApplicationShell>();
// const workspaceService = TypeMoq.Mock.ofType<IWorkspaceService>();
const workspaceService = mock(WorkspaceService);
Expand Down Expand Up @@ -634,16 +634,11 @@ export class DataScienceIocContainer extends UnitTestIocContainer {
activateEnvInCurrentTerminal: false
};

condaService.setup(c => c.isCondaAvailable()).returns(() => Promise.resolve(false));
condaService.setup(c => c.isCondaEnvironment(TypeMoq.It.isValue(pythonPath))).returns(() => Promise.resolve(false));
condaService.setup(c => c.condaEnvironmentsFile).returns(() => undefined);

this.serviceManager.addSingleton<IEnvironmentVariablesProvider>(IEnvironmentVariablesProvider, EnvironmentVariablesProvider);
this.serviceManager.addSingleton<IVirtualEnvironmentsSearchPathProvider>(IVirtualEnvironmentsSearchPathProvider, GlobalVirtualEnvironmentsSearchPathProvider, 'global');
this.serviceManager.addSingleton<IVirtualEnvironmentsSearchPathProvider>(IVirtualEnvironmentsSearchPathProvider, WorkspaceVirtualEnvironmentsSearchPathProvider, 'workspace');
this.serviceManager.addSingleton<IVirtualEnvironmentManager>(IVirtualEnvironmentManager, VirtualEnvironmentManager);

this.serviceManager.addSingletonInstance<ICondaService>(ICondaService, condaService.object);
this.serviceManager.addSingletonInstance<IApplicationShell>(IApplicationShell, appShell.object);
this.serviceManager.addSingletonInstance<IDocumentManager>(IDocumentManager, this.documentManager);
this.serviceManager.addSingletonInstance<IWorkspaceService>(IWorkspaceService, instance(workspaceService));
Expand Down Expand Up @@ -684,12 +679,19 @@ export class DataScienceIocContainer extends UnitTestIocContainer {

// Create our jupyter mock if necessary
if (this.shouldMockJupyter) {
const condaService = TypeMoq.Mock.ofType<ICondaService>();
this.serviceManager.addSingletonInstance<ICondaService>(ICondaService, condaService.object);
condaService.setup(c => c.isCondaAvailable()).returns(() => Promise.resolve(false));
condaService.setup(c => c.isCondaEnvironment(TypeMoq.It.isValue(pythonPath))).returns(() => Promise.resolve(false));
condaService.setup(c => c.condaEnvironmentsFile).returns(() => undefined);

this.jupyterMock = new MockJupyterManagerFactory(this.serviceManager);
// When using mocked Jupyter, default to using default kernel.
const kernelService = mock(KernelService);
when(kernelService.searchAndRegisterKernel(anything(), anything())).thenResolve(undefined);
this.serviceManager.addSingletonInstance<KernelService>(KernelService, instance(kernelService));
} else {
this.serviceManager.addSingleton<ICondaService>(ICondaService, CondaService);
this.serviceManager.addSingleton<KernelService>(KernelService, KernelService);
this.serviceManager.addSingleton<IProcessServiceFactory>(IProcessServiceFactory, ProcessServiceFactory);
this.serviceManager.addSingleton<IPythonExecutionFactory>(IPythonExecutionFactory, PythonExecutionFactory);
Expand Down