Skip to content

Commit 2eae4c6

Browse files
committed
Skip 5.6 invalid package test
1 parent 63dae78 commit 2eae4c6

File tree

5 files changed

+21
-75
lines changed

5 files changed

+21
-75
lines changed

assets/test/package5.6/Package.resolved

Lines changed: 0 additions & 23 deletions
This file was deleted.

assets/test/package5.6/Package.swift

Lines changed: 0 additions & 20 deletions
This file was deleted.

assets/test/package5.6/Sources/package5.6/package5_6.swift

Lines changed: 0 additions & 6 deletions
This file was deleted.

src/SwiftPackage.ts

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,8 @@ export class SwiftPackage {
275275
dependencies: [],
276276
targets: [],
277277
};
278+
// eslint-disable-next-line no-console
279+
console.log(">>> ", folderContext.folder.fsPath, ">>> DISABLED, EMPTY: ", empty);
278280
this.contentsResolve(empty);
279281
return empty;
280282
}
@@ -291,21 +293,39 @@ export class SwiftPackage {
291293
};
292294

293295
this.contentsResolve(packageState);
296+
// eslint-disable-next-line no-console
297+
console.log(">>> ", folderContext.folder.fsPath, ">>> SUCCESS: ", packageState);
294298
return packageState;
295299
} catch (error: unknown) {
300+
// eslint-disable-next-line no-console
301+
console.log(">>> ", folderContext.folder.fsPath, ">>> ERROR: ", error);
296302
const errorMessage = error instanceof Error ? error.message : String(error);
297303
// if caught error and it begins with "error: root manifest" then there is no Package.swift
298304
if (
299305
errorMessage.startsWith("error: root manifest") ||
300306
errorMessage.startsWith("error: Could not find Package.swift")
301307
) {
308+
// eslint-disable-next-line no-console
309+
console.log(
310+
">>> ",
311+
folderContext.folder.fsPath,
312+
">>> RESOLVE, UNDEFINED: ",
313+
undefined
314+
);
302315
this.contentsResolve(undefined);
303316
return undefined;
304317
} else {
305318
// otherwise it is an error loading the Package.swift so return `null` indicating
306319
// we have a package but we failed to load it. Calling resolve instead of reject is intent
320+
// eslint-disable-next-line no-console
321+
console.log(
322+
">>> ",
323+
folderContext.folder.fsPath,
324+
">>> RESOLVE, ERROR: ",
325+
Error(getErrorDescription(error))
326+
);
307327
this.contentsResolve(Error(getErrorDescription(error)));
308-
return undefined;
328+
return Error(getErrorDescription(error));
309329
}
310330
}
311331
}

test/integration-tests/SwiftPackage.test.ts

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import * as assert from "assert";
1616
import { FolderContext } from "@src/FolderContext";
1717
import { SwiftPackage } from "@src/SwiftPackage";
1818
import { WorkspaceContext } from "@src/WorkspaceContext";
19-
import { Version } from "@src/utilities/version";
2019

2120
import { tag } from "../tags";
2221
import { activateExtensionForSuite } from "./utilities/testutilities";
@@ -96,30 +95,6 @@ tag("medium").suite("SwiftPackage Test Suite", function () {
9695
});
9796
});
9897

99-
suite("package5.6", () => {
100-
const asset = "package5.6";
101-
102-
let swiftVersion: Version;
103-
activateExtensionForSuite({
104-
async setup(ctx) {
105-
swiftVersion = ctx.globalToolchain.swiftVersion;
106-
swiftPackage = getFolderContext(ctx, asset).swiftPackage;
107-
},
108-
testAssets: [asset],
109-
});
110-
111-
test("Package resolve v2", async function () {
112-
if (
113-
(process.platform === "win32" && swiftVersion.isLessThan(new Version(6, 0, 0))) ||
114-
swiftVersion.isLessThan(new Version(5, 6, 0))
115-
) {
116-
this.skip();
117-
}
118-
assert.strictEqual(await swiftPackage.isValid, true);
119-
assert(swiftPackage.resolved !== undefined);
120-
});
121-
});
122-
12398
suite("identity-case", () => {
12499
const asset = "identity-case";
125100

0 commit comments

Comments
 (0)