Merge branch 'test-project-support' into instant-eagle-pytest-execution

Author: eleanorjboyd

src/client/testing/testController/common/testDiscoveryHandler.ts

@@ -41,7 +41,7 @@ export class TestDiscoveryHandler {
 
         // Check if there were any errors in the discovery process.
         if (rawTestData.status === 'error') {
-            this.createErrorNode(testController, workspaceUri, rawTestData.error, testProvider, projectId);
+            this.createErrorNode(testController, workspaceUri, rawTestData.error, testProvider, projectId, projectName);
         } else {
             // remove error node only if no errors exist.
             const errorNodeId = projectId
@@ -85,6 +85,7 @@ export class TestDiscoveryHandler {
         error: string[] | undefined,
         testProvider: TestProvider,
         projectId?: string,
+        projectName?: string,
     ): void {
         const workspacePath = workspaceUri.fsPath;
         const testingErrorConst =
@@ -102,7 +103,7 @@ export class TestDiscoveryHandler {
         );
 
         if (errorNode === undefined) {
-            const options = buildErrorNodeOptions(workspaceUri, message, testProvider);
+            const options = buildErrorNodeOptions(workspaceUri, message, testProvider, projectName);
             // Update the error node ID to include project scope if applicable
             options.id = errorNodeId;
             errorNode = createErrorTestItem(testController, options);

src/client/testing/testController/common/utils.ts

@@ -188,7 +188,12 @@ function isPytestNotInstalledError(message: string): boolean {
     );
 }
 
-export function buildErrorNodeOptions(uri: Uri, message: string, testType: string): ErrorTestItemOptions {
+export function buildErrorNodeOptions(
+    uri: Uri,
+    message: string,
+    testType: string,
+    projectName?: string,
+): ErrorTestItemOptions {
     let labelText = testType === 'pytest' ? 'pytest Discovery Error' : 'Unittest Discovery Error';
     let errorMessage = message;
 
@@ -199,9 +204,12 @@ export function buildErrorNodeOptions(uri: Uri, message: string, testType: strin
             'pytest is not installed in the selected Python environment. Please install pytest to enable test discovery and execution.';
     }
 
+    // Use project name for label if available (project-based testing), otherwise use folder name
+    const displayName = projectName ?? path.basename(uri.fsPath);
+
     return {
         id: `DiscoveryError:${uri.fsPath}`,
-        label: `${labelText} [${path.basename(uri.fsPath)}]`,
+        label: `${labelText} [${displayName}]`,
         error: errorMessage,
     };
 }

src/test/testing/testController/common/buildErrorNodeOptions.unit.test.ts

@@ -48,4 +48,30 @@ suite('buildErrorNodeOptions - pytest not installed detection', () => {
         expect(result.label).to.equal('Unittest Discovery Error [workspace]');
         expect(result.error).to.equal("ModuleNotFoundError: No module named 'pytest'");
     });
+
+    test('Should use project name in label when projectName is provided', () => {
+        const errorMessage = 'Some error occurred';
+
+        const result = buildErrorNodeOptions(workspaceUri, errorMessage, 'unittest', 'my-project');
+
+        expect(result.label).to.equal('Unittest Discovery Error [my-project]');
+        expect(result.error).to.equal('Some error occurred');
+    });
+
+    test('Should use project name in label for pytest when projectName is provided', () => {
+        const errorMessage = 'Some error occurred';
+
+        const result = buildErrorNodeOptions(workspaceUri, errorMessage, 'pytest', 'ada');
+
+        expect(result.label).to.equal('pytest Discovery Error [ada]');
+        expect(result.error).to.equal('Some error occurred');
+    });
+
+    test('Should use folder name when projectName is undefined', () => {
+        const errorMessage = 'Some error occurred';
+
+        const result = buildErrorNodeOptions(workspaceUri, errorMessage, 'unittest', undefined);
+
+        expect(result.label).to.equal('Unittest Discovery Error [workspace]');
+    });
 });