Skip to content

Commit 941fcfa

Browse files
authored
Fixes from TPIs (#21896)
Closes #21884 Closes #21889
1 parent f255e02 commit 941fcfa

File tree

5 files changed

+20
-9
lines changed

5 files changed

+20
-9
lines changed

src/client/common/utils/localize.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,9 @@ export namespace CreateEnv {
468468
export const recreateDescription = l10n.t('Delete existing ".venv" environment and create a new one');
469469
export const useExisting = l10n.t('Use Existing');
470470
export const useExistingDescription = l10n.t('Use existing ".venv" environment with no changes to it');
471-
export const existingVenvQuickPickPlaceholder = l10n.t('Use or Recreate existing environment?');
471+
export const existingVenvQuickPickPlaceholder = l10n.t(
472+
'Choose an option to handle the existing ".venv" environment',
473+
);
472474
export const deletingEnvironmentProgress = l10n.t('Deleting existing ".venv" environment...');
473475
export const errorDeletingEnvironment = l10n.t('Error while deleting existing ".venv" environment.');
474476
}

src/client/pythonEnvironments/creation/provider/condaCreationProvider.ts

+4-2
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,9 @@ async function createCondaEnv(
128128
dispose();
129129
if (proc?.exitCode !== 0) {
130130
traceError('Error while running venv creation script: ', progressAndTelemetry.getLastError());
131-
deferred.reject(progressAndTelemetry.getLastError());
131+
deferred.reject(
132+
progressAndTelemetry.getLastError() || `Conda env creation failed with exitCode: ${proc?.exitCode}`,
133+
);
132134
} else {
133135
deferred.resolve(condaEnvPath);
134136
}
@@ -249,7 +251,7 @@ async function createEnvironment(options?: CreateEnvironmentOptions): Promise<Cr
249251
} catch (ex) {
250252
traceError(ex);
251253
showErrorMessageWithLogs(CreateEnv.Conda.errorCreatingEnvironment);
252-
throw ex;
254+
return { error: ex as Error };
253255
}
254256
},
255257
);

src/client/pythonEnvironments/creation/provider/venvCreationProvider.ts

+5-2
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,10 @@ async function createVenv(
120120
dispose();
121121
if (proc?.exitCode !== 0) {
122122
traceError('Error while running venv creation script: ', progressAndTelemetry.getLastError());
123-
deferred.reject(progressAndTelemetry.getLastError());
123+
deferred.reject(
124+
progressAndTelemetry.getLastError() ||
125+
`Failed to create virtual environment with exitCode: ${proc?.exitCode}`,
126+
);
124127
} else {
125128
deferred.resolve(venvPath);
126129
}
@@ -327,7 +330,7 @@ export class VenvCreationProvider implements CreateEnvironmentProvider {
327330
} catch (ex) {
328331
traceError(ex);
329332
showErrorMessageWithLogs(CreateEnv.Venv.errorCreatingEnvironment);
330-
throw ex;
333+
return { error: ex as Error };
331334
}
332335
},
333336
);

src/test/pythonEnvironments/creation/provider/condaCreationProvider.unit.test.ts

+4-2
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,8 @@ suite('Conda Creation provider tests', () => {
185185
assert.isDefined(_error);
186186
_error!('bad arguments');
187187
_complete!();
188-
await assert.isRejected(promise);
188+
const result = await promise;
189+
assert.ok(result?.error);
189190
assert.isTrue(showErrorMessageWithLogsStub.calledOnce);
190191
});
191192

@@ -241,7 +242,8 @@ suite('Conda Creation provider tests', () => {
241242

242243
_next!({ out: `${CONDA_ENV_CREATED_MARKER}new_environment`, source: 'stdout' });
243244
_complete!();
244-
await assert.isRejected(promise);
245+
const result = await promise;
246+
assert.ok(result?.error);
245247
assert.isTrue(showErrorMessageWithLogsStub.calledOnce);
246248
});
247249
});

src/test/pythonEnvironments/creation/provider/venvCreationProvider.unit.test.ts

+4-2
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,8 @@ suite('venv Creation provider tests', () => {
226226
assert.isDefined(_error);
227227
_error!('bad arguments');
228228
_complete!();
229-
await assert.isRejected(promise);
229+
const result = await promise;
230+
assert.ok(result?.error);
230231
assert.isTrue(showErrorMessageWithLogsStub.calledOnce);
231232
assert.isTrue(deleteEnvironmentStub.notCalled);
232233
});
@@ -283,7 +284,8 @@ suite('venv Creation provider tests', () => {
283284

284285
_next!({ out: `${VENV_CREATED_MARKER}new_environment`, source: 'stdout' });
285286
_complete!();
286-
await assert.isRejected(promise);
287+
const result = await promise;
288+
assert.ok(result?.error);
287289
interpreterQuickPick.verifyAll();
288290
progressMock.verifyAll();
289291
assert.isTrue(showErrorMessageWithLogsStub.calledOnce);

0 commit comments

Comments
 (0)