comments

Author: eleanorjboyd

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

@@ -104,14 +104,14 @@ export class TestDiscoveryHandler {
                 errorText.includes('No module named');
 
             if (isImportError) {
-                traceWarn(
-                    `---
-                    [test-by-project] Import error during unittest discovery for project at ${workspacePath}. ` +
-                        `This may be caused by test files in nested project directories that require different dependencies. ` +
-                        `If these tests are discovered successfully by their own project (with the correct Python environment), ` +
-                        `this error can be safely ignored. To avoid this, consider excluding nested project paths from parent project discovery.
-                        ---`,
-                );
+                const warningMessage =
+                    '--- ' +
+                    `[test-by-project] Import error during unittest discovery for project at ${workspacePath}. ` +
+                    'This may be caused by test files in nested project directories that require different dependencies. ' +
+                    'If these tests are discovered successfully by their own project (with the correct Python environment), ' +
+                    'this error can be safely ignored. To avoid this, consider excluding nested project paths from parent project discovery. ' +
+                    '---';
+                traceWarn(warningMessage);
             }
         }
 

src/test/testing/testController/unittest/testExecutionAdapter.unit.test.ts

@@ -534,6 +534,14 @@ suite('Unittest test execution adapter', () => {
         };
         runInBackgroundStub.resolves(mockProc2 as any);
 
+        // Create a promise that resolves when runInBackground is called
+        const runInBackgroundCalled = new Promise<void>((resolve) => {
+            runInBackgroundStub.callsFake(() => {
+                resolve();
+                return Promise.resolve(mockProc2 as any);
+            });
+        });
+
         const testRun = typeMoq.Mock.ofType<TestRun>();
         testRun
             .setup((t) => t.token)
@@ -557,8 +565,8 @@ suite('Unittest test execution adapter', () => {
             mockProject,
         );
 
-        // Wait for the runInBackground to be called
-        await new Promise((resolve) => setTimeout(resolve, 10));
+        // Wait for runInBackground to be called
+        await runInBackgroundCalled;
 
         // Simulate process exit to complete the test
         exitCallbacks.forEach((cb) => cb(0, null));