diff --git a/src/test/common/process/pythonProc.simple.multiroot.test.ts b/src/test/common/process/pythonProc.simple.multiroot.test.ts index e68a9f24b836..b40d5f03aaaa 100644 --- a/src/test/common/process/pythonProc.simple.multiroot.test.ts +++ b/src/test/common/process/pythonProc.simple.multiroot.test.ts @@ -16,6 +16,7 @@ import { IWorkspaceService } from '../../../client/common/application/types'; import { WorkspaceService } from '../../../client/common/application/workspace'; import { ConfigurationService } from '../../../client/common/configuration/service'; import { STANDARD_OUTPUT_CHANNEL } from '../../../client/common/constants'; +import { Logger } from '../../../client/common/logger'; import { PersistentStateFactory } from '../../../client/common/persistentState'; import { IS_WINDOWS } from '../../../client/common/platform/constants'; import { FileSystem } from '../../../client/common/platform/fileSystem'; @@ -26,7 +27,7 @@ import { CurrentProcess } from '../../../client/common/process/currentProcess'; import { ProcessLogger } from '../../../client/common/process/logger'; import { registerTypes as processRegisterTypes } from '../../../client/common/process/serviceRegistry'; import { IProcessLogger, IPythonExecutionFactory, StdErrError } from '../../../client/common/process/types'; -import { GLOBAL_MEMENTO, IConfigurationService, ICurrentProcess, IDisposableRegistry, IMemento, IOutputChannel, IPathUtils, IPersistentStateFactory, IsWindows, WORKSPACE_MEMENTO } from '../../../client/common/types'; +import { GLOBAL_MEMENTO, IConfigurationService, ICurrentProcess, IDisposableRegistry, ILogger, IMemento, IOutputChannel, IPathUtils, IPersistentStateFactory, IsWindows, WORKSPACE_MEMENTO } from '../../../client/common/types'; import { clearCache } from '../../../client/common/utils/cacheUtils'; import { OSType } from '../../../client/common/utils/platform'; import { @@ -35,6 +36,9 @@ import { import { EnvironmentActivationService } from '../../../client/interpreter/activation/service'; import { IEnvironmentActivationService } from '../../../client/interpreter/activation/types'; import { IInterpreterAutoSelectionService, IInterpreterAutoSeletionProxyService } from '../../../client/interpreter/autoSelection/types'; +import { ICondaService, IInterpreterService } from '../../../client/interpreter/contracts'; +import { InterpreterService } from '../../../client/interpreter/interpreterService'; +import { CondaService } from '../../../client/interpreter/locators/services/condaService'; import { InterpreterHashProvider } from '../../../client/interpreter/locators/services/hashProvider'; import { InterpeterHashProviderFactory } from '../../../client/interpreter/locators/services/hashProviderFactory'; import { InterpreterFilter } from '../../../client/interpreter/locators/services/interpreterFilter'; @@ -98,9 +102,17 @@ suite('PythonExecutableService', () => { serviceManager.addSingleton(IPersistentStateFactory, PersistentStateFactory); serviceManager.addSingleton(IMemento, MockMemento, GLOBAL_MEMENTO); serviceManager.addSingleton(IMemento, MockMemento, WORKSPACE_MEMENTO); + + serviceManager.addSingleton(ICondaService, CondaService); + serviceManager.addSingleton(ILogger, Logger); + processRegisterTypes(serviceManager); variablesRegisterTypes(serviceManager); + const mockInterpreterService = mock(InterpreterService); + when(mockInterpreterService.hasInterpreters).thenResolve(false); + serviceManager.addSingletonInstance(IInterpreterService, instance(mockInterpreterService)); + const mockEnvironmentActivationService = mock(EnvironmentActivationService); when(mockEnvironmentActivationService.getActivatedEnvironmentVariables(anything())).thenResolve(); serviceManager.addSingletonInstance(IEnvironmentActivationService, instance(mockEnvironmentActivationService)); diff --git a/src/test/linters/lint.multiroot.test.ts b/src/test/linters/lint.multiroot.test.ts index 2fda48c4a7b6..6c5fdcf2a4a9 100644 --- a/src/test/linters/lint.multiroot.test.ts +++ b/src/test/linters/lint.multiroot.test.ts @@ -6,6 +6,8 @@ import { CTagsProductPathService, DataScienceProductPathService, FormatterProduc import { ProductService } from '../../client/common/installer/productService'; import { IProductPathService, IProductService } from '../../client/common/installer/types'; import { IConfigurationService, IOutputChannel, Product, ProductType } from '../../client/common/types'; +import { ICondaService } from '../../client/interpreter/contracts'; +import { CondaService } from '../../client/interpreter/locators/services/condaService'; import { ILinter, ILinterManager } from '../../client/linters/types'; import { TEST_OUTPUT_CHANNEL } from '../../client/testing/common/constants'; import { closeActiveWindows, initialize, initializeTest, IS_MULTI_ROOT_TEST } from '../initialize'; @@ -44,7 +46,9 @@ suite('Multiroot Linting', () => { ioc.registerLinterTypes(); ioc.registerVariableTypes(); ioc.registerPlatformTypes(); + ioc.registerMockInterpreterTypes(); ioc.serviceManager.addSingletonInstance(IProductService, new ProductService()); + ioc.serviceManager.addSingleton(ICondaService, CondaService); ioc.serviceManager.addSingleton(IProductPathService, CTagsProductPathService, ProductType.WorkspaceSymbols); ioc.serviceManager.addSingleton(IProductPathService, FormatterProductPathService, ProductType.Formatter); ioc.serviceManager.addSingleton(IProductPathService, LinterProductPathService, ProductType.Linter); diff --git a/src/test/refactor/extension.refactor.extract.var.test.ts b/src/test/refactor/extension.refactor.extract.var.test.ts index acfa756ae500..ee74a04f7f85 100644 --- a/src/test/refactor/extension.refactor.extract.var.test.ts +++ b/src/test/refactor/extension.refactor.extract.var.test.ts @@ -53,6 +53,7 @@ suite('Variable Extraction', () => { ioc.registerCommonTypes(); ioc.registerProcessTypes(); ioc.registerVariableTypes(); + ioc.registerMockInterpreterTypes(); ioc.serviceManager.addSingleton(ICondaService, CondaService); }