Skip to content

Commit ea16da0

Browse files
authored
Fix flaky package dependency tests (#1288)
* Seem to be intermittent failures if defaultPackage was not in the the workspace context as a package folder so lets be explicit Issue: #1258
1 parent 052d583 commit ea16da0

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

test/integration-tests/commands/build.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ suite("Build Commands @slow", function () {
4242
// The description of this package is crashing on Windows with Swift 5.9.x and below
4343
if (
4444
process.platform === "win32" &&
45-
ctx.toolchain.swiftVersion.isLessThan(new Version(6, 0, 0))
45+
ctx.toolchain.swiftVersion.isLessThanOrEqual(new Version(5, 9, 0))
4646
) {
4747
this.skip();
4848
}

test/integration-tests/ui/PackageDependencyProvider.test.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,11 @@ suite("PackageDependencyProvider Test Suite", function () {
3232
async setup(ctx) {
3333
const workspaceContext = ctx;
3434
await waitForNoRunningTasks();
35+
await folderInRootWorkspace("defaultPackage", workspaceContext);
3536
const folderContext = await folderInRootWorkspace("dependencies", workspaceContext);
3637
await executeTaskAndWaitForResult((await getBuildAllTask(folderContext)) as SwiftTask);
37-
await workspaceContext.focusFolder(folderContext);
3838
treeProvider = new PackageDependenciesProvider(workspaceContext);
39+
await workspaceContext.focusFolder(folderContext);
3940
},
4041
async teardown() {
4142
treeProvider.dispose();

0 commit comments

Comments
 (0)