From 0a8e846598315a2e8aa07d39a7c8ea674094b76d Mon Sep 17 00:00:00 2001
From: Paul LeMarquand <plemarquand@apple.com>
Date: Thu, 20 Feb 2025 15:17:46 -0500
Subject: [PATCH] Fixup task test

---
 test/integration-tests/ui/ProjectPanelProvider.test.ts | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/test/integration-tests/ui/ProjectPanelProvider.test.ts b/test/integration-tests/ui/ProjectPanelProvider.test.ts
index f8a50bc1a..98b14bc1a 100644
--- a/test/integration-tests/ui/ProjectPanelProvider.test.ts
+++ b/test/integration-tests/ui/ProjectPanelProvider.test.ts
@@ -39,7 +39,9 @@ suite("ProjectPanelProvider Test Suite", function () {
             await vscode.workspace.openTextDocument(
                 path.join(folderContext.folder.fsPath, "Package.swift")
             );
-            await executeTaskAndWaitForResult((await getBuildAllTask(folderContext)) as SwiftTask);
+            const buildAllTask = await getBuildAllTask(folderContext);
+            buildAllTask.definition.dontTriggerTestDiscovery = true;
+            await executeTaskAndWaitForResult(buildAllTask as SwiftTask);
             await folderContext.loadSwiftPlugins();
             treeProvider = new ProjectPanelProvider(workspaceContext);
             await workspaceContext.focusFolder(folderContext);
@@ -56,8 +58,6 @@ suite("ProjectPanelProvider Test Suite", function () {
         resetSettings = await updateSettings({
             "swift.debugger.debugAdapter": "CodeLLDB",
         });
-
-        await waitForNoRunningTasks();
     });
 
     afterEach(async () => {
@@ -96,6 +96,9 @@ suite("ProjectPanelProvider Test Suite", function () {
     });
 
     suite("Tasks", () => {
+        beforeEach(async () => {
+            await waitForNoRunningTasks();
+        });
         test("Includes tasks", async () => {
             const tasks = await getHeaderChildren("Tasks");
             const dep = tasks.find(n => n.name === "Build All (targets)") as PackageNode;