add name for imports

DonJayamanne · DonJayamanne · commit a588eccd4394 · 2017-12-29T20:20:28.000-08:00
diff --git a/src/test/common/process/pythonProc.simple.multiroot.test.ts b/src/test/common/process/pythonProc.simple.multiroot.test.ts
@@ -8,12 +8,13 @@ import { Container } from 'inversify';
 import { EOL } from 'os';
 import * as path from 'path';
 import { ConfigurationTarget, Disposable, Uri } from 'vscode';
+import { ConfigurationService } from '../../../client/common/config/configurationService';
 import { PythonSettings } from '../../../client/common/configSettings';
 import { PathUtils } from '../../../client/common/platform/pathUtils';
 import { CurrentProcess } from '../../../client/common/process/currentProcess';
 import { registerTypes as processRegisterTypes } from '../../../client/common/process/serviceRegistry';
 import { IPythonExecutionFactory, StdErrError } from '../../../client/common/process/types';
-import { ICurrentProcess, IDisposableRegistry, IPathUtils, IsWindows } from '../../../client/common/types';
+import { IConfigurationService, ICurrentProcess, IDisposableRegistry, IPathUtils, IsWindows } from '../../../client/common/types';
 import { IS_WINDOWS } from '../../../client/common/utils';
 import { registerTypes as variablesRegisterTypes } from '../../../client/common/variables/serviceRegistry';
 import { ServiceManager } from '../../../client/ioc/serviceManager';
@@ -46,6 +47,7 @@ suite('PythonExecutableService', () => {
         serviceManager.addSingletonInstance<boolean>(IsWindows, IS_WINDOWS);
         serviceManager.addSingleton<IPathUtils>(IPathUtils, PathUtils);
         serviceManager.addSingleton<ICurrentProcess>(ICurrentProcess, CurrentProcess);
+        serviceManager.addSingleton<IConfigurationService>(IConfigurationService, ConfigurationService);
         processRegisterTypes(serviceManager);
         variablesRegisterTypes(serviceManager);
         return initializeTest();
diff --git a/src/test/format/extension.sort.test.ts b/src/test/format/extension.sort.test.ts
@@ -40,7 +40,7 @@ suite('Sorting', () => {
         await updateSetting('sortImports.args', [], Uri.file(sortingPath), configTarget);
         await closeActiveWindows();
         const pythonExecutionFactory = ioc.serviceContainer.get<IPythonExecutionFactory>(IPythonExecutionFactory);
-        const processService = ioc.serviceContainer.get<IProcessService>(IProcessService);
+        const processService = ioc.serviceContainer.get<IProcessService>(IProcessService, 'standard');
         sorter = new PythonImportSortProvider(pythonExecutionFactory, processService);
     });
     teardown(async () => {
diff --git a/src/test/interpreters/interpreterVersion.test.ts b/src/test/interpreters/interpreterVersion.test.ts
@@ -29,7 +29,7 @@ suite('Interpreters display version', () => {
     }
 
     test('Must return the Python Version', async () => {
-        const pythonProcess = ioc.serviceContainer.get<IProcessService>(IProcessService);
+        const pythonProcess = ioc.serviceContainer.get<IProcessService>(IProcessService, 'standard');
         const output = await pythonProcess.exec('python', ['--version'], { cwd: __dirname, mergeStdOutErr: true });
         const version = output.stdout.splitLines()[0];
         const interpreterVersion = ioc.serviceContainer.get<IInterpreterVersionService>(IInterpreterVersionService);
@@ -42,7 +42,7 @@ suite('Interpreters display version', () => {
         assert.equal(pyVersion, 'DEFAULT_TEST_VALUE', 'Incorrect version');
     });
     test('Must return the pip Version', async () => {
-        const pythonProcess = ioc.serviceContainer.get<IProcessService>(IProcessService);
+        const pythonProcess = ioc.serviceContainer.get<IProcessService>(IProcessService, 'standard');
         const result = await pythonProcess.exec('python', ['-m', 'pip', '--version'], { cwd: __dirname, mergeStdOutErr: true });
         const output = result.stdout.splitLines()[0];
         // Take the second part, see below example.
