test: preserve package refresh failures

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Copilot-Session: edcaaa35-9a42-4351-98fa-55bcf8f1968e

Author: edvilme

src/test/common/testUtils.unit.test.ts

@@ -71,6 +71,15 @@ suite('Test Utilities', () => {
             );
             assert.ok(counter >= 3);
         });
+
+        test('should preserve condition errors when retries are disabled', async () => {
+            const conditionError = new Error('Package refresh failed');
+
+            await assert.rejects(
+                () => waitForCondition(() => Promise.reject(conditionError), 1000, 'Should not time out', 10, false),
+                (error: unknown) => error === conditionError,
+            );
+        });
     });
 
     suite('retryUntilSuccess', () => {

src/test/integration/packageManager.integration.test.ts

@@ -156,6 +156,7 @@ for (const profile of profiles) {
                 30_000,
                 'Package not installed',
                 1_000,
+                false,
             );
 
             const directPackageNames = await vscode.commands.executeCommand<string[] | undefined>(
@@ -176,6 +177,7 @@ for (const profile of profiles) {
                     30_000,
                     'Package not uninstalled',
                     1_000,
+                    false,
                 );
             }
         });

src/test/managers/common/packageManagerHeadlessConformance.unit.test.ts

@@ -38,7 +38,7 @@ suite('Package manager headless conformance', () => {
         const condaPicker = sinon.stub(condaUtils, 'getCommonCondaPackagesToInstall');
         const poetryInput = sinon.stub(windowApis, 'showInputBox');
 
-        for (const manager of createManagers()) {
+        for (const manager of createManagers().all) {
             await manager.manage(environment, { install: [], runHeadless: true });
         }
 
@@ -61,7 +61,7 @@ suite('Package manager headless conformance', () => {
         const showErrorMessage = sinon.stub(windowApis, 'showErrorMessage').resolves(undefined);
         const showErrorMessageWithLogs = sinon.stub(errorUtils, 'showErrorMessageWithLogs').resolves();
 
-        for (const manager of createManagers()) {
+        for (const manager of createManagers().all) {
             await assert.rejects(
                 manager.manage(environment, { install: ['requests'], runHeadless: true }),
                 (error: unknown) => error === operationError,
@@ -92,7 +92,7 @@ suite('Package manager headless conformance', () => {
         sinon.stub(PipPackageManager.prototype, 'getDirectPackageNames').resolves(undefined);
         const showErrorMessage = sinon.stub(windowApis, 'showErrorMessage').resolves(undefined);
         const showErrorMessageWithLogs = sinon.stub(errorUtils, 'showErrorMessageWithLogs').resolves();
-        const manager = createManagers()[0];
+        const manager = createManagers().pip;
 
         await manager.manage(environment, { install: ['requests'], runHeadless: true });
         await flushImmediate();
@@ -110,7 +110,7 @@ suite('Package manager headless conformance', () => {
         sinon.stub(condaUtils, 'runCondaExecutable').rejects(refreshError);
         const showErrorMessage = sinon.stub(windowApis, 'showErrorMessage').resolves(undefined);
         const showErrorMessageWithLogs = sinon.stub(errorUtils, 'showErrorMessageWithLogs').resolves();
-        const manager = createManagers()[1];
+        const manager = createManagers().conda;
 
         await assert.rejects(
             manager.manage(environment, { install: ['requests'], runHeadless: true }),
@@ -141,7 +141,7 @@ suite('Package manager headless conformance', () => {
         });
         const showErrorMessage = sinon.stub(windowApis, 'showErrorMessage').resolves(undefined);
         const showErrorMessageWithLogs = sinon.stub(errorUtils, 'showErrorMessageWithLogs').resolves();
-        const manager = createManagers()[2];
+        const manager = createManagers().poetry;
 
         await manager.manage(environment, { install: ['requests'], runHeadless: true });
         await flushImmediate();
@@ -152,7 +152,12 @@ suite('Package manager headless conformance', () => {
         assert.ok(showErrorMessageWithLogs.notCalled);
     });
 
-    function createManagers(): PackageManager[] {
+    function createManagers(): {
+        pip: PackageManager;
+        conda: PackageManager;
+        poetry: PackageManager;
+        all: PackageManager[];
+    } {
         const api = {
             createPackageItem: sinon.stub(),
             getPythonProjects: sinon.stub().returns([]),
@@ -163,11 +168,12 @@ suite('Package manager headless conformance', () => {
             info: sinon.stub(),
             show: sinon.stub(),
         } as unknown as LogOutputChannel;
-        return [
-            new PipPackageManager(api, log, { getProjectsByEnvironment: sinon.stub().returns([]) } as unknown as VenvManager),
-            new CondaPackageManager(api, log),
-            new PoetryPackageManager(api, log, {} as PoetryManager),
-        ];
+        const pip = new PipPackageManager(api, log, {
+            getProjectsByEnvironment: sinon.stub().returns([]),
+        } as unknown as VenvManager);
+        const conda = new CondaPackageManager(api, log);
+        const poetry = new PoetryPackageManager(api, log, {} as PoetryManager);
+        return { pip, conda, poetry, all: [pip, conda, poetry] };
     }
 
     async function flushImmediate(): Promise<void> {

src/test/testUtils.ts

@@ -28,6 +28,7 @@ export function sleep(ms: number): Promise<void> {
  * @param timeoutMs - Maximum time to wait (default: 10 seconds)
  * @param errorMessage - Error message if condition is not met
  * @param pollIntervalMs - How often to check condition (default: 100ms)
+ * @param retryOnError - Whether rejected conditions should be retried (default: true)
  *
  * @example
  * // Wait for extension to activate
@@ -50,6 +51,7 @@ export async function waitForCondition(
     timeoutMs: number = 10_000,
     errorMessage: string | (() => string) = 'Condition not met within timeout',
     pollIntervalMs: number = 100,
+    retryOnError: boolean = true,
 ): Promise<void> {
     return new Promise<void>((resolve, reject) => {
         const startTime = Date.now();
@@ -61,8 +63,11 @@ export async function waitForCondition(
                     resolve();
                     return;
                 }
-            } catch {
-                // Condition threw - keep waiting
+            } catch (error) {
+                if (!retryOnError) {
+                    reject(error);
+                    return;
+                }
             }
 
             if (Date.now() - startTime >= timeoutMs) {