Skip to content

Commit eb0e5e9

Browse files
authored
Fix CI tests failing because of he conda run PR (#8730)
1 parent 55d54b2 commit eb0e5e9

File tree

3 files changed

+18
-1
lines changed

3 files changed

+18
-1
lines changed

src/test/common/process/pythonProc.simple.multiroot.test.ts

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import { IWorkspaceService } from '../../../client/common/application/types';
1616
import { WorkspaceService } from '../../../client/common/application/workspace';
1717
import { ConfigurationService } from '../../../client/common/configuration/service';
1818
import { STANDARD_OUTPUT_CHANNEL } from '../../../client/common/constants';
19+
import { Logger } from '../../../client/common/logger';
1920
import { PersistentStateFactory } from '../../../client/common/persistentState';
2021
import { IS_WINDOWS } from '../../../client/common/platform/constants';
2122
import { FileSystem } from '../../../client/common/platform/fileSystem';
@@ -26,7 +27,7 @@ import { CurrentProcess } from '../../../client/common/process/currentProcess';
2627
import { ProcessLogger } from '../../../client/common/process/logger';
2728
import { registerTypes as processRegisterTypes } from '../../../client/common/process/serviceRegistry';
2829
import { IProcessLogger, IPythonExecutionFactory, StdErrError } from '../../../client/common/process/types';
29-
import { GLOBAL_MEMENTO, IConfigurationService, ICurrentProcess, IDisposableRegistry, IMemento, IOutputChannel, IPathUtils, IPersistentStateFactory, IsWindows, WORKSPACE_MEMENTO } from '../../../client/common/types';
30+
import { GLOBAL_MEMENTO, IConfigurationService, ICurrentProcess, IDisposableRegistry, ILogger, IMemento, IOutputChannel, IPathUtils, IPersistentStateFactory, IsWindows, WORKSPACE_MEMENTO } from '../../../client/common/types';
3031
import { clearCache } from '../../../client/common/utils/cacheUtils';
3132
import { OSType } from '../../../client/common/utils/platform';
3233
import {
@@ -35,6 +36,9 @@ import {
3536
import { EnvironmentActivationService } from '../../../client/interpreter/activation/service';
3637
import { IEnvironmentActivationService } from '../../../client/interpreter/activation/types';
3738
import { IInterpreterAutoSelectionService, IInterpreterAutoSeletionProxyService } from '../../../client/interpreter/autoSelection/types';
39+
import { ICondaService, IInterpreterService } from '../../../client/interpreter/contracts';
40+
import { InterpreterService } from '../../../client/interpreter/interpreterService';
41+
import { CondaService } from '../../../client/interpreter/locators/services/condaService';
3842
import { InterpreterHashProvider } from '../../../client/interpreter/locators/services/hashProvider';
3943
import { InterpeterHashProviderFactory } from '../../../client/interpreter/locators/services/hashProviderFactory';
4044
import { InterpreterFilter } from '../../../client/interpreter/locators/services/interpreterFilter';
@@ -98,9 +102,17 @@ suite('PythonExecutableService', () => {
98102
serviceManager.addSingleton<IPersistentStateFactory>(IPersistentStateFactory, PersistentStateFactory);
99103
serviceManager.addSingleton<Memento>(IMemento, MockMemento, GLOBAL_MEMENTO);
100104
serviceManager.addSingleton<Memento>(IMemento, MockMemento, WORKSPACE_MEMENTO);
105+
106+
serviceManager.addSingleton<ICondaService>(ICondaService, CondaService);
107+
serviceManager.addSingleton<ILogger>(ILogger, Logger);
108+
101109
processRegisterTypes(serviceManager);
102110
variablesRegisterTypes(serviceManager);
103111

112+
const mockInterpreterService = mock(InterpreterService);
113+
when(mockInterpreterService.hasInterpreters).thenResolve(false);
114+
serviceManager.addSingletonInstance<IInterpreterService>(IInterpreterService, instance(mockInterpreterService));
115+
104116
const mockEnvironmentActivationService = mock(EnvironmentActivationService);
105117
when(mockEnvironmentActivationService.getActivatedEnvironmentVariables(anything())).thenResolve();
106118
serviceManager.addSingletonInstance<IEnvironmentActivationService>(IEnvironmentActivationService, instance(mockEnvironmentActivationService));

src/test/linters/lint.multiroot.test.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ import { CTagsProductPathService, DataScienceProductPathService, FormatterProduc
66
import { ProductService } from '../../client/common/installer/productService';
77
import { IProductPathService, IProductService } from '../../client/common/installer/types';
88
import { IConfigurationService, IOutputChannel, Product, ProductType } from '../../client/common/types';
9+
import { ICondaService } from '../../client/interpreter/contracts';
10+
import { CondaService } from '../../client/interpreter/locators/services/condaService';
911
import { ILinter, ILinterManager } from '../../client/linters/types';
1012
import { TEST_OUTPUT_CHANNEL } from '../../client/testing/common/constants';
1113
import { closeActiveWindows, initialize, initializeTest, IS_MULTI_ROOT_TEST } from '../initialize';
@@ -44,7 +46,9 @@ suite('Multiroot Linting', () => {
4446
ioc.registerLinterTypes();
4547
ioc.registerVariableTypes();
4648
ioc.registerPlatformTypes();
49+
ioc.registerMockInterpreterTypes();
4750
ioc.serviceManager.addSingletonInstance<IProductService>(IProductService, new ProductService());
51+
ioc.serviceManager.addSingleton<ICondaService>(ICondaService, CondaService);
4852
ioc.serviceManager.addSingleton<IProductPathService>(IProductPathService, CTagsProductPathService, ProductType.WorkspaceSymbols);
4953
ioc.serviceManager.addSingleton<IProductPathService>(IProductPathService, FormatterProductPathService, ProductType.Formatter);
5054
ioc.serviceManager.addSingleton<IProductPathService>(IProductPathService, LinterProductPathService, ProductType.Linter);

src/test/refactor/extension.refactor.extract.var.test.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ suite('Variable Extraction', () => {
5353
ioc.registerCommonTypes();
5454
ioc.registerProcessTypes();
5555
ioc.registerVariableTypes();
56+
ioc.registerMockInterpreterTypes();
5657

5758
ioc.serviceManager.addSingleton<ICondaService>(ICondaService, CondaService);
5859
}

0 commit comments

Comments
 (0)