Skip to content

Commit a3d7cfe

Browse files
author
Kartik Raj
committed
Revert "Fix unit tests related to terminal code execution (#18549)"
This reverts commit c5e5979.
1 parent 236f579 commit a3d7cfe

File tree

2 files changed

+19
-142
lines changed

2 files changed

+19
-142
lines changed

‎src/test/terminals/codeExecution/djangoShellCodeExect.unit.test.ts

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,7 @@ import { ICommandManager, IDocumentManager, IWorkspaceService } from '../../../c
1010
import { IFileSystem, IPlatformService } from '../../../client/common/platform/types';
1111
import { createCondaEnv } from '../../../client/common/process/pythonEnvironment';
1212
import { createPythonProcessService } from '../../../client/common/process/pythonProcess';
13-
import {
14-
IProcessService,
15-
IPythonExecutionFactory,
16-
IPythonExecutionService,
17-
} from '../../../client/common/process/types';
13+
import { IProcessService, IPythonExecutionFactory } from '../../../client/common/process/types';
1814
import { ITerminalService, ITerminalServiceFactory } from '../../../client/common/terminal/types';
1915
import { IConfigurationService, IPythonSettings, ITerminalSettings } from '../../../client/common/types';
2016
import { DjangoShellCodeExecutionProvider } from '../../../client/terminals/codeExecution/djangoShellCodeExecution';
@@ -23,7 +19,6 @@ import { PYTHON_PATH } from '../../common';
2319
import { Conda, CONDA_RUN_VERSION } from '../../../client/pythonEnvironments/common/environmentManagers/conda';
2420
import { SemVer } from 'semver';
2521
import assert from 'assert';
26-
import { PythonExecInfo } from '../../../client/pythonEnvironments/exec';
2722

2823
suite('Terminal - Django Shell Code Execution', () => {
2924
let executor: ICodeExecutionService;
@@ -90,14 +85,7 @@ suite('Terminal - Django Shell Code Execution', () => {
9085
resource?: Uri,
9186
) {
9287
platform.setup((p) => p.isWindows).returns(() => isWindows);
93-
const executionService = TypeMoq.Mock.ofType<IPythonExecutionService>();
94-
pythonExecutionFactory
95-
.setup((p) => p.create(TypeMoq.It.isAny()))
96-
.returns(() => Promise.resolve(executionService.object));
97-
executionService.setup((p) => (p as any).then).returns(() => undefined);
98-
executionService
99-
.setup((e) => e.getExecutionInfo())
100-
.returns(() => (({ command: pythonPath, args: [] } as unknown) as PythonExecInfo));
88+
settings.setup((s) => s.pythonPath).returns(() => pythonPath);
10189
terminalSettings.setup((t) => t.launchArgs).returns(() => terminalArgs);
10290

10391
const replCommandArgs = await (executor as DjangoShellCodeExecutionProvider).getExecutableInfo(resource);
@@ -216,14 +204,7 @@ suite('Terminal - Django Shell Code Execution', () => {
216204
condaEnv: { name: string; path: string },
217205
resource?: Uri,
218206
) {
219-
const executionService = TypeMoq.Mock.ofType<IPythonExecutionService>();
220-
pythonExecutionFactory
221-
.setup((p) => p.create(TypeMoq.It.isAny()))
222-
.returns(() => Promise.resolve(executionService.object));
223-
executionService.setup((p) => (p as any).then).returns(() => undefined);
224-
executionService
225-
.setup((e) => e.getExecutionInfo())
226-
.returns(() => (({ command: pythonPath, args: [] } as unknown) as PythonExecInfo));
207+
settings.setup((s) => s.pythonPath).returns(() => pythonPath);
227208
terminalSettings.setup((t) => t.launchArgs).returns(() => terminalArgs);
228209

229210
const condaFile = 'conda';

‎src/test/terminals/codeExecution/terminalCodeExec.unit.test.ts

Lines changed: 16 additions & 120 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,7 @@ import { ICommandManager, IDocumentManager, IWorkspaceService } from '../../../c
1010
import { IFileSystem, IPlatformService } from '../../../client/common/platform/types';
1111
import { createCondaEnv } from '../../../client/common/process/pythonEnvironment';
1212
import { createPythonProcessService } from '../../../client/common/process/pythonProcess';
13-
import {
14-
IProcessService,
15-
IPythonExecutionFactory,
16-
IPythonExecutionService,
17-
} from '../../../client/common/process/types';
13+
import { IProcessService, IPythonExecutionFactory } from '../../../client/common/process/types';
1814
import {
1915
ITerminalService,
2016
ITerminalServiceFactory,
@@ -30,7 +26,6 @@ import { ICodeExecutionService } from '../../../client/terminals/types';
3026
import { PYTHON_PATH } from '../../common';
3127
import * as sinon from 'sinon';
3228
import assert from 'assert';
33-
import { PythonExecInfo } from '../../../client/pythonEnvironments/exec';
3429

3530
suite('Terminal - Code Execution', () => {
3631
['Terminal Execution', 'Repl Execution', 'Django Execution'].forEach((testSuiteName) => {
@@ -145,14 +140,7 @@ suite('Terminal - Code Execution', () => {
145140
platform.setup((p) => p.isWindows).returns(() => isWindows);
146141
platform.setup((p) => p.isMac).returns(() => isOsx);
147142
platform.setup((p) => p.isLinux).returns(() => isLinux);
148-
const executionService = TypeMoq.Mock.ofType<IPythonExecutionService>();
149-
pythonExecutionFactory
150-
.setup((p) => p.create(TypeMoq.It.isAny()))
151-
.returns(() => Promise.resolve(executionService.object));
152-
executionService.setup((p) => (p as any).then).returns(() => undefined);
153-
executionService
154-
.setup((e) => e.getExecutionInfo())
155-
.returns(() => (({ command: PYTHON_PATH, args: [] } as unknown) as PythonExecInfo));
143+
settings.setup((s) => s.pythonPath).returns(() => PYTHON_PATH);
156144
terminalSettings.setup((t) => t.launchArgs).returns(() => []);
157145

158146
await executor.initializeRepl();
@@ -185,14 +173,7 @@ suite('Terminal - Code Execution', () => {
185173
workspace.setup((w) => w.rootPath).returns(() => path.join('c:', 'path', 'to'));
186174
workspaceFolder.setup((w) => w.uri).returns(() => Uri.file(path.join('c:', 'path', 'to')));
187175
platform.setup((p) => p.isWindows).returns(() => true);
188-
const executionService = TypeMoq.Mock.ofType<IPythonExecutionService>();
189-
pythonExecutionFactory
190-
.setup((p) => p.create(TypeMoq.It.isAny()))
191-
.returns(() => Promise.resolve(executionService.object));
192-
executionService.setup((p) => (p as any).then).returns(() => undefined);
193-
executionService
194-
.setup((e) => e.getExecutionInfo())
195-
.returns(() => (({ command: PYTHON_PATH, args: [] } as unknown) as PythonExecInfo));
176+
settings.setup((s) => s.pythonPath).returns(() => PYTHON_PATH);
196177
terminalSettings.setup((t) => t.launchArgs).returns(() => []);
197178

198179
await executor.executeFile(file);
@@ -217,14 +198,7 @@ suite('Terminal - Code Execution', () => {
217198
workspace.setup((w) => w.rootPath).returns(() => path.join('c:', 'path', 'to'));
218199
workspaceFolder.setup((w) => w.uri).returns(() => Uri.file(path.join('c:', 'path', 'to')));
219200
platform.setup((p) => p.isWindows).returns(() => true);
220-
const executionService = TypeMoq.Mock.ofType<IPythonExecutionService>();
221-
pythonExecutionFactory
222-
.setup((p) => p.create(TypeMoq.It.isAny()))
223-
.returns(() => Promise.resolve(executionService.object));
224-
executionService.setup((p) => (p as any).then).returns(() => undefined);
225-
executionService
226-
.setup((e) => e.getExecutionInfo())
227-
.returns(() => (({ command: PYTHON_PATH, args: [] } as unknown) as PythonExecInfo));
201+
settings.setup((s) => s.pythonPath).returns(() => PYTHON_PATH);
228202
terminalSettings.setup((t) => t.launchArgs).returns(() => []);
229203

230204
await executor.executeFile(file);
@@ -240,14 +214,7 @@ suite('Terminal - Code Execution', () => {
240214
workspace.setup((w) => w.getWorkspaceFolder(TypeMoq.It.isAny())).returns(() => workspaceFolder.object);
241215
workspaceFolder.setup((w) => w.uri).returns(() => Uri.file(path.join('c', 'path', 'to')));
242216
platform.setup((p) => p.isWindows).returns(() => false);
243-
const executionService = TypeMoq.Mock.ofType<IPythonExecutionService>();
244-
pythonExecutionFactory
245-
.setup((p) => p.create(TypeMoq.It.isAny()))
246-
.returns(() => Promise.resolve(executionService.object));
247-
executionService.setup((p) => (p as any).then).returns(() => undefined);
248-
executionService
249-
.setup((e) => e.getExecutionInfo())
250-
.returns(() => (({ command: PYTHON_PATH, args: [] } as unknown) as PythonExecInfo));
217+
settings.setup((s) => s.pythonPath).returns(() => PYTHON_PATH);
251218
terminalSettings.setup((t) => t.launchArgs).returns(() => []);
252219

253220
await executor.executeFile(file);
@@ -271,14 +238,7 @@ suite('Terminal - Code Execution', () => {
271238
workspace.setup((w) => w.getWorkspaceFolder(TypeMoq.It.isAny())).returns(() => workspaceFolder.object);
272239
workspaceFolder.setup((w) => w.uri).returns(() => Uri.file(path.join('c', 'path', 'to')));
273240
platform.setup((p) => p.isWindows).returns(() => isWindows);
274-
const executionService = TypeMoq.Mock.ofType<IPythonExecutionService>();
275-
pythonExecutionFactory
276-
.setup((p) => p.create(TypeMoq.It.isAny()))
277-
.returns(() => Promise.resolve(executionService.object));
278-
executionService.setup((p) => (p as any).then).returns(() => undefined);
279-
executionService
280-
.setup((e) => e.getExecutionInfo())
281-
.returns(() => (({ command: PYTHON_PATH, args: [] } as unknown) as PythonExecInfo));
241+
settings.setup((s) => s.pythonPath).returns(() => PYTHON_PATH);
282242
terminalSettings.setup((t) => t.launchArgs).returns(() => []);
283243

284244
await executor.executeFile(file);
@@ -304,14 +264,7 @@ suite('Terminal - Code Execution', () => {
304264
.setup((w) => w.uri)
305265
.returns(() => Uri.file(path.join('c', 'path', 'to', 'file with spaces in path')));
306266
platform.setup((p) => p.isWindows).returns(() => isWindows);
307-
const executionService = TypeMoq.Mock.ofType<IPythonExecutionService>();
308-
pythonExecutionFactory
309-
.setup((p) => p.create(TypeMoq.It.isAny()))
310-
.returns(() => Promise.resolve(executionService.object));
311-
executionService.setup((p) => (p as any).then).returns(() => undefined);
312-
executionService
313-
.setup((e) => e.getExecutionInfo())
314-
.returns(() => (({ command: PYTHON_PATH, args: [] } as unknown) as PythonExecInfo));
267+
settings.setup((s) => s.pythonPath).returns(() => PYTHON_PATH);
315268
terminalSettings.setup((t) => t.launchArgs).returns(() => []);
316269

317270
await executor.executeFile(file);
@@ -332,14 +285,7 @@ suite('Terminal - Code Execution', () => {
332285
terminalSettings.setup((t) => t.executeInFileDir).returns(() => true);
333286
workspace.setup((w) => w.getWorkspaceFolder(TypeMoq.It.isAny())).returns(() => undefined);
334287
platform.setup((p) => p.isWindows).returns(() => isWindows);
335-
const executionService = TypeMoq.Mock.ofType<IPythonExecutionService>();
336-
pythonExecutionFactory
337-
.setup((p) => p.create(TypeMoq.It.isAny()))
338-
.returns(() => Promise.resolve(executionService.object));
339-
executionService.setup((p) => (p as any).then).returns(() => undefined);
340-
executionService
341-
.setup((e) => e.getExecutionInfo())
342-
.returns(() => (({ command: PYTHON_PATH, args: [] } as unknown) as PythonExecInfo));
288+
settings.setup((s) => s.pythonPath).returns(() => PYTHON_PATH);
343289
terminalSettings.setup((t) => t.launchArgs).returns(() => []);
344290

345291
await executor.executeFile(file);
@@ -360,14 +306,7 @@ suite('Terminal - Code Execution', () => {
360306
file: Uri,
361307
): Promise<void> {
362308
platform.setup((p) => p.isWindows).returns(() => isWindows);
363-
const executionService = TypeMoq.Mock.ofType<IPythonExecutionService>();
364-
pythonExecutionFactory
365-
.setup((p) => p.create(TypeMoq.It.isAny()))
366-
.returns(() => Promise.resolve(executionService.object));
367-
executionService.setup((p) => (p as any).then).returns(() => undefined);
368-
executionService
369-
.setup((e) => e.getExecutionInfo())
370-
.returns(() => (({ command: pythonPath, args: [] } as unknown) as PythonExecInfo));
309+
settings.setup((s) => s.pythonPath).returns(() => pythonPath);
371310
terminalSettings.setup((t) => t.launchArgs).returns(() => terminalArgs);
372311
terminalSettings.setup((t) => t.executeInFileDir).returns(() => false);
373312
workspace.setup((w) => w.getWorkspaceFolder(TypeMoq.It.isAny())).returns(() => undefined);
@@ -411,15 +350,7 @@ suite('Terminal - Code Execution', () => {
411350
file: Uri,
412351
condaEnv: { name: string; path: string },
413352
): Promise<void> {
414-
const condaRunArgs = 'conda run args';
415-
const executionService = TypeMoq.Mock.ofType<IPythonExecutionService>();
416-
pythonExecutionFactory
417-
.setup((p) => p.create(TypeMoq.It.isAny()))
418-
.returns(() => Promise.resolve(executionService.object));
419-
executionService.setup((p) => (p as any).then).returns(() => undefined);
420-
executionService
421-
.setup((e) => e.getExecutionInfo())
422-
.returns(() => (({ command: pythonPath, args: condaRunArgs } as unknown) as PythonExecInfo));
353+
settings.setup((s) => s.pythonPath).returns(() => pythonPath);
423354
terminalSettings.setup((t) => t.launchArgs).returns(() => terminalArgs);
424355
terminalSettings.setup((t) => t.executeInFileDir).returns(() => false);
425356
workspace.setup((w) => w.getWorkspaceFolder(TypeMoq.It.isAny())).returns(() => undefined);
@@ -451,7 +382,7 @@ suite('Terminal - Code Execution', () => {
451382

452383
await executor.executeFile(file);
453384

454-
const expectedArgs = [...condaRunArgs, ...terminalArgs, file.fsPath.fileToCommandArgument()];
385+
const expectedArgs = [...terminalArgs, file.fsPath.fileToCommandArgument()];
455386

456387
terminalService.verify(
457388
async (t) => t.sendCommand(TypeMoq.It.isValue(pythonPath), TypeMoq.It.isValue(expectedArgs)),
@@ -485,14 +416,7 @@ suite('Terminal - Code Execution', () => {
485416
.setup((p) => p.createCondaExecutionService(TypeMoq.It.isAny(), TypeMoq.It.isAny()))
486417
.returns(() => Promise.resolve(undefined));
487418
platform.setup((p) => p.isWindows).returns(() => isWindows);
488-
const executionService = TypeMoq.Mock.ofType<IPythonExecutionService>();
489-
pythonExecutionFactory
490-
.setup((p) => p.create(TypeMoq.It.isAny()))
491-
.returns(() => Promise.resolve(executionService.object));
492-
executionService.setup((p) => (p as any).then).returns(() => undefined);
493-
executionService
494-
.setup((e) => e.getExecutionInfo())
495-
.returns(() => (({ command: pythonPath, args: [] } as unknown) as PythonExecInfo));
419+
settings.setup((s) => s.pythonPath).returns(() => pythonPath);
496420
terminalSettings.setup((t) => t.launchArgs).returns(() => terminalArgs);
497421
const expectedTerminalArgs = isDjangoRepl ? terminalArgs.concat(['manage.py', 'shell']) : terminalArgs;
498422

@@ -542,14 +466,7 @@ suite('Terminal - Code Execution', () => {
542466
terminalArgs: string[],
543467
condaEnv: { name: string; path: string },
544468
) {
545-
const executionService = TypeMoq.Mock.ofType<IPythonExecutionService>();
546-
pythonExecutionFactory
547-
.setup((p) => p.create(TypeMoq.It.isAny()))
548-
.returns(() => Promise.resolve(executionService.object));
549-
executionService.setup((p) => (p as any).then).returns(() => undefined);
550-
executionService
551-
.setup((e) => e.getExecutionInfo())
552-
.returns(() => (({ command: pythonPath, args: [] } as unknown) as PythonExecInfo));
469+
settings.setup((s) => s.pythonPath).returns(() => pythonPath);
553470
terminalSettings.setup((t) => t.launchArgs).returns(() => terminalArgs);
554471

555472
const condaFile = 'conda';
@@ -619,14 +536,7 @@ suite('Terminal - Code Execution', () => {
619536
const terminalArgs = ['-a', 'b', 'c'];
620537

621538
platform.setup((p) => p.isWindows).returns(() => false);
622-
const executionService = TypeMoq.Mock.ofType<IPythonExecutionService>();
623-
pythonExecutionFactory
624-
.setup((p) => p.create(TypeMoq.It.isAny()))
625-
.returns(() => Promise.resolve(executionService.object));
626-
executionService.setup((p) => (p as any).then).returns(() => undefined);
627-
executionService
628-
.setup((e) => e.getExecutionInfo())
629-
.returns(() => (({ command: pythonPath, args: [] } as unknown) as PythonExecInfo));
539+
settings.setup((s) => s.pythonPath).returns(() => pythonPath);
630540
terminalSettings.setup((t) => t.launchArgs).returns(() => terminalArgs);
631541

632542
await executor.execute('cmd1');
@@ -645,14 +555,7 @@ suite('Terminal - Code Execution', () => {
645555
const pythonPath = 'usr/bin/python1234';
646556
const terminalArgs = ['-a', 'b', 'c'];
647557
platform.setup((p) => p.isWindows).returns(() => false);
648-
const executionService = TypeMoq.Mock.ofType<IPythonExecutionService>();
649-
pythonExecutionFactory
650-
.setup((p) => p.create(TypeMoq.It.isAny()))
651-
.returns(() => Promise.resolve(executionService.object));
652-
executionService.setup((p) => (p as any).then).returns(() => undefined);
653-
executionService
654-
.setup((e) => e.getExecutionInfo())
655-
.returns(() => (({ command: pythonPath, args: [] } as unknown) as PythonExecInfo));
558+
settings.setup((s) => s.pythonPath).returns(() => pythonPath);
656559
terminalSettings.setup((t) => t.launchArgs).returns(() => terminalArgs);
657560

658561
let closeTerminalCallback: undefined | (() => void);
@@ -699,14 +602,7 @@ suite('Terminal - Code Execution', () => {
699602
const pythonPath = 'usr/bin/python1234';
700603
const terminalArgs = ['-a', 'b', 'c'];
701604
platform.setup((p) => p.isWindows).returns(() => false);
702-
const executionService = TypeMoq.Mock.ofType<IPythonExecutionService>();
703-
pythonExecutionFactory
704-
.setup((p) => p.create(TypeMoq.It.isAny()))
705-
.returns(() => Promise.resolve(executionService.object));
706-
executionService.setup((p) => (p as any).then).returns(() => undefined);
707-
executionService
708-
.setup((e) => e.getExecutionInfo())
709-
.returns(() => (({ command: pythonPath, args: [] } as unknown) as PythonExecInfo));
605+
settings.setup((s) => s.pythonPath).returns(() => pythonPath);
710606
terminalSettings.setup((t) => t.launchArgs).returns(() => terminalArgs);
711607

712608
await executor.execute('cmd1');

0 commit comments

Comments
 (0)