Minor clean up to the comment and unused import

swiftlang · Dec 3, 2024 · ab0773b · ab0773b
1 parent aa796c9
commit ab0773b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 13 deletions.
diff --git a/test/integration-tests/commands/build.test.ts b/test/integration-tests/commands/build.test.ts
@@ -29,15 +29,13 @@ import {
     folderInRootWorkspace,
     updateSettings,
 } from "../utilities/testutilities";
-import { pathExists } from "../../../src/utilities/filesystem";
 
 suite("Build Commands", function () {
     // Default timeout is a bit too short, give it a little bit more time
     this.timeout(30 * 1000);
 
     let folderContext: FolderContext;
     let workspaceContext: WorkspaceContext;
-    let buildPath: string;
     const uri = testAssetUri("defaultPackage/Sources/PackageExe/main.swift");
     const breakpoints = [
         new vscode.SourceBreakpoint(new vscode.Location(uri, new vscode.Position(2, 0))),
@@ -48,7 +46,6 @@ suite("Build Commands", function () {
             workspaceContext = ctx;
             await waitForNoRunningTasks();
             folderContext = await folderInRootWorkspace("defaultPackage", workspaceContext);
-            buildPath = path.join(folderContext.folder.fsPath, ".build");
             await workspaceContext.focusFolder(folderContext);
             await vscode.window.showTextDocument(uri);
             const settingsTeardown = await updateSettings({
@@ -62,13 +59,6 @@ suite("Build Commands", function () {
         },
     });
 
-    teardown(async () => {
-        // Remove the build directory after each test case
-        if (await pathExists(buildPath)) {
-            await fs.rm(buildPath, { recursive: true, force: true });
-        }
-    });
-
     test("Swift: Run Build", async () => {
         // A breakpoint will have not effect on the Run command.
         vscode.debug.addBreakpoints(breakpoints);
@@ -83,14 +73,14 @@ suite("Build Commands", function () {
         let result = await vscode.commands.executeCommand(Commands.RUN);
         expect(result).to.be.true;
 
+        const buildPath = path.join(folderContext.folder.fsPath, ".build");
         const beforeItemCount = (await fs.readdir(buildPath)).length;
 
         result = await vscode.commands.executeCommand(Commands.CLEAN_BUILD);
         expect(result).to.be.true;
 
         const afterItemCount = (await fs.readdir(buildPath)).length;
-        // This test will run in order after the Swift: Run Build test,
-        // where .build folder is going to be filled with built artifacts.
+        // .build folder is going to be filled with built artifacts after Commands.RUN command
         // After executing the clean command the build directory is guranteed to have less entry.
         expect(afterItemCount).to.be.lessThan(beforeItemCount);
     });

diff --git a/test/integration-tests/commands/dependency.test.ts b/test/integration-tests/commands/dependency.test.ts
@@ -120,7 +120,7 @@ suite("Dependency Commmands Test Suite", function () {
 
             // This will now pass as we have the required library
             const { exitCode, output } = await executeTaskAndWaitForResult(tasks);
-            expect(exitCode, `Exit code non zero, command output:\n${output}`).to.equal(0);
+            expect(exitCode, `${output}`).to.equal(0);
             expect(output).to.include("defaultpackage");
             expect(output).to.include("not used by any target");
         }