Skip to content

Remove redundant waitForNoRunningTasks() #1612

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 13, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions test/integration-tests/BackgroundCompilation.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import * as assert from "assert";
import * as vscode from "vscode";
import { WorkspaceContext } from "../../src/WorkspaceContext";
import { testAssetUri } from "../fixtures";
import { waitForNoRunningTasks } from "../utilities/tasks";
import { Workbench } from "../../src/utilities/commands";
import { activateExtensionForTest, updateSettings } from "./utilities/testutilities";

Expand All @@ -27,7 +26,6 @@ suite("BackgroundCompilation Test Suite", () => {
async setup(ctx) {
workspaceContext = ctx;
assert.notEqual(workspaceContext.folders.length, 0);
await waitForNoRunningTasks();
return await updateSettings({
"swift.backgroundCompilation": true,
});
Expand Down
2 changes: 0 additions & 2 deletions test/integration-tests/SwiftSnippet.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@

import * as vscode from "vscode";
import { testAssetUri } from "../fixtures";
import { waitForNoRunningTasks } from "../utilities/tasks";
import { expect } from "chai";
import {
continueSession,
Expand Down Expand Up @@ -52,7 +51,6 @@ suite("SwiftSnippet Test Suite @slow", function () {
resetSettings = await updateSettings({
"swift.debugger.debugAdapter": "lldb-dap",
});
await waitForNoRunningTasks();

// File needs to be open for command to be enabled
await workspaceContext.focusFolder(folder);
Expand Down
2 changes: 0 additions & 2 deletions test/integration-tests/commands/build.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import * as vscode from "vscode";
import * as fs from "fs/promises";
import * as path from "path";
import { expect } from "chai";
import { waitForNoRunningTasks } from "../../utilities/tasks";
import { testAssetUri } from "../../fixtures";
import { FolderContext } from "../../../src/FolderContext";
import { WorkspaceContext } from "../../../src/WorkspaceContext";
Expand Down Expand Up @@ -49,7 +48,6 @@ suite("Build Commands @slow", function () {
vscode.debug.addBreakpoints(breakpoints);

workspaceContext = ctx;
await waitForNoRunningTasks();
folderContext = await folderInRootWorkspace("defaultPackage", workspaceContext);
await workspaceContext.focusFolder(folderContext);
},
Expand Down
3 changes: 1 addition & 2 deletions test/integration-tests/commands/dependency.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import { FolderContext } from "../../../src/FolderContext";
import { WorkspaceContext } from "../../../src/WorkspaceContext";
import { Commands } from "../../../src/commands";
import { activateExtensionForSuite, folderInRootWorkspace } from "../utilities/testutilities";
import { executeTaskAndWaitForResult, waitForNoRunningTasks } from "../../utilities/tasks";
import { executeTaskAndWaitForResult } from "../../utilities/tasks";
import { createBuildAllTask } from "../../../src/tasks/SwiftTaskProvider";

suite("Dependency Commmands Test Suite", function () {
Expand All @@ -40,7 +40,6 @@ suite("Dependency Commmands Test Suite", function () {

setup(async () => {
await workspaceContext.focusFolder(depsContext);
await waitForNoRunningTasks();
});

test("Swift: Update Package Dependencies", async function () {
Expand Down
10 changes: 1 addition & 9 deletions test/integration-tests/tasks/SwiftExecution.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,7 @@ import * as vscode from "vscode";
import * as assert from "assert";
import { testSwiftTask } from "../../fixtures";
import { WorkspaceContext } from "../../../src/WorkspaceContext";
import {
executeTaskAndWaitForResult,
waitForNoRunningTasks,
waitForStartTaskProcess,
} from "../../utilities/tasks";
import { executeTaskAndWaitForResult, waitForStartTaskProcess } from "../../utilities/tasks";
import { SwiftToolchain } from "../../../src/toolchain/toolchain";
import { activateExtensionForSuite } from "../utilities/testutilities";

Expand All @@ -38,10 +34,6 @@ suite("SwiftExecution Tests Suite", () => {
},
});

setup(async () => {
await waitForNoRunningTasks();
});

test("Close event handler fires", async () => {
const fixture = testSwiftTask("swift", ["build"], workspaceFolder, toolchain);
const promise = executeTaskAndWaitForResult(fixture);
Expand Down
10 changes: 1 addition & 9 deletions test/integration-tests/tasks/SwiftTaskProvider.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,7 @@ import {
getBuildAllTask,
} from "../../../src/tasks/SwiftTaskProvider";
import { SwiftToolchain } from "../../../src/toolchain/toolchain";
import {
executeTaskAndWaitForResult,
waitForEndTaskProcess,
waitForNoRunningTasks,
} from "../../utilities/tasks";
import { executeTaskAndWaitForResult, waitForEndTaskProcess } from "../../utilities/tasks";
import { Version } from "../../../src/utilities/version";
import { FolderContext } from "../../../src/FolderContext";
import { mockGlobalObject } from "../../MockUtils";
Expand All @@ -51,10 +47,6 @@ suite("SwiftTaskProvider Test Suite", () => {
});

suite("createSwiftTask", () => {
setup(async () => {
await waitForNoRunningTasks();
});

test("Exit code on success", async () => {
const task = createSwiftTask(
["--help"],
Expand Down
5 changes: 0 additions & 5 deletions test/integration-tests/tasks/TaskManager.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import * as assert from "assert";
import { TaskManager } from "../../../src/tasks/TaskManager";
import { WorkspaceContext } from "../../../src/WorkspaceContext";
import { activateExtensionForSuite } from "../utilities/testutilities";
import { waitForNoRunningTasks } from "../../utilities/tasks";

suite("TaskManager Test Suite", () => {
let workspaceContext: WorkspaceContext;
Expand All @@ -31,10 +30,6 @@ suite("TaskManager Test Suite", () => {
},
});

setup(async () => {
await waitForNoRunningTasks();
});

// check running task will return expected value
test("Return value", async () => {
const exitTask = new vscode.Task(
Expand Down
5 changes: 0 additions & 5 deletions test/integration-tests/tasks/TaskQueue.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import * as assert from "assert";
import { testAssetPath } from "../../fixtures";
import { WorkspaceContext } from "../../../src/WorkspaceContext";
import { SwiftExecOperation, TaskOperation, TaskQueue } from "../../../src/tasks/TaskQueue";
import { waitForNoRunningTasks } from "../../utilities/tasks";
import { activateExtensionForSuite } from "../utilities/testutilities";

suite("TaskQueue Test Suite", () => {
Expand All @@ -32,10 +31,6 @@ suite("TaskQueue Test Suite", () => {
},
});

setup(async () => {
await waitForNoRunningTasks();
});

// check queuing task will return expected value
test("Return value", async () => {
const exitTask = new vscode.Task(
Expand Down