Fix issues with multi-root workspace runs

microsoft · Jul 28, 2021 · 3263955 · 3263955
1 parent fae3a47
commit 3263955
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 7 deletions.
diff --git a/src/client/testing/testController/pytest/pytestController.ts b/src/client/testing/testController/pytest/pytestController.ts
@@ -241,9 +241,15 @@ export class PytestController implements ITestFrameworkController {
     ): Promise<void> {
         let runRequest = request;
         if (!runRequest.include) {
-            const testItem = testController.items.get(workspace.uri.fsPath);
-            if (testItem) {
-                runRequest = new TestRunRequest([testItem], undefined, request.profile);
+            const testItems: TestItem[] = [];
+            testController.items.forEach((i) => {
+                const w = this.workspaceService.getWorkspaceFolder(i.uri);
+                if (w?.uri.fsPath === workspace.uri.fsPath) {
+                    testItems.push(i);
+                }
+            });
+            if (testItems.length > 0) {
+                runRequest = new TestRunRequest(testItems, undefined, request.profile);
             }
         }
 

diff --git a/src/client/testing/testController/unittest/runner.ts b/src/client/testing/testController/unittest/runner.ts
@@ -44,7 +44,11 @@ export class UnittestRunner implements ITestsRunner {
             debug,
         };
 
-        const runInstance = testController.createTestRun(request);
+        const runInstance = testController.createTestRun(
+            request,
+            `Running Tests for Workspace ${runOptions.workspaceFolder.fsPath}`,
+            true,
+        );
         const dispose = options.token.onCancellationRequested(() => {
             runInstance.end();
         });

diff --git a/src/client/testing/testController/unittest/unittestController.ts b/src/client/testing/testController/unittest/unittestController.ts
@@ -213,9 +213,15 @@ for s in generate_test_cases(suite):
     ): Promise<void> {
         let runRequest = request;
         if (!runRequest.include) {
-            const testItem = testController.items.get(workspace.uri.fsPath);
-            if (testItem) {
-                runRequest = new TestRunRequest([testItem], undefined, request.profile);
+            const testItems: TestItem[] = [];
+            testController.items.forEach((i) => {
+                const w = this.workspaceService.getWorkspaceFolder(i.uri);
+                if (w?.uri.fsPath === workspace.uri.fsPath) {
+                    testItems.push(i);
+                }
+            });
+            if (testItems.length > 0) {
+                runRequest = new TestRunRequest(testItems, undefined, request.profile);
             }
         }