Skip to content

Commit d40b3a9

Browse files
committed
add to testexecution
1 parent 6af849b commit d40b3a9

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

src/client/common/process/pythonExecutionFactory.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ export class PythonExecutionFactory implements IPythonExecutionFactory {
102102
const windowsStoreInterpreterCheck = this.pyenvs.isMicrosoftStoreInterpreter.bind(this.pyenvs);
103103
console.log('EJFB, 4.11', pythonPath);
104104
const a = await windowsStoreInterpreterCheck(pythonPath);
105-
console.log('EJFB, 4.11.5', a, processService, this.fileSystem);
105+
console.log('EJFB, 4.11.5', a, processService);
106106
const env = a
107107
? createMicrosoftStoreEnv(pythonPath, processService)
108108
: createPythonEnv(pythonPath, processService, this.fileSystem);

src/client/testing/testController/unittest/testExecutionAdapter.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,11 +150,13 @@ export class UnittestTestExecutionAdapter implements ITestExecutionAdapter {
150150
resource: options.workspaceFolder,
151151
};
152152
const execService = await executionFactory?.createActivatedEnvironment(creationOptions);
153+
console.log('EJFB 6.0');
153154
const args = [options.command.script].concat(options.command.args);
154155

155156
if (options.outChannel) {
156157
options.outChannel.appendLine(`python ${args.join(' ')}`);
157158
}
159+
console.log('EJFB 6.1');
158160

159161
try {
160162
if (options.profileKind && options.profileKind === TestRunProfileKind.Debug) {
@@ -167,7 +169,7 @@ export class UnittestTestExecutionAdapter implements ITestExecutionAdapter {
167169
pytestPort: resultNamedPipeName, // change this from pytest
168170
};
169171
traceInfo(`Running DEBUG unittest for workspace ${options.cwd} with arguments: ${args}\r\n`);
170-
172+
console.log('EJFB 6.2');
171173
if (debugLauncher === undefined) {
172174
traceError('Debug launcher is not defined');
173175
throw new Error('Debug launcher is not defined');
@@ -193,7 +195,7 @@ export class UnittestTestExecutionAdapter implements ITestExecutionAdapter {
193195
serverCancel.cancel();
194196
}
195197
});
196-
198+
console.log('EJFB 6.3');
197199
const result = execService?.execObservable(args, spawnOptions);
198200
resultProc = result?.proc;
199201

@@ -211,7 +213,7 @@ export class UnittestTestExecutionAdapter implements ITestExecutionAdapter {
211213
runInstance?.appendOutput(`${out}`);
212214
spawnOptions?.outputChannel?.append(out);
213215
});
214-
216+
console.log('EJFB 6.4');
215217
result?.proc?.on('exit', (code, signal) => {
216218
// if the child has testIds then this is a run request
217219
spawnOptions?.outputChannel?.append(MESSAGE_ON_TESTING_OUTPUT_MOVE);
@@ -228,6 +230,7 @@ export class UnittestTestExecutionAdapter implements ITestExecutionAdapter {
228230
);
229231
}
230232
}
233+
console.log('EJFB 6.5');
231234
deferredTillExecClose.resolve();
232235
serverCancel.cancel();
233236
});

0 commit comments

Comments
 (0)