Skip to content

Commit f15c770

Browse files
committed
Fix VS Code integration tests on macOS
VS Code 1.131 removed the legacy Contents/MacOS/Electron compatibility executable on macOS. Upgrade @vscode/test-electron to 3.1.0 so the test harness resolves the executable from the application bundle metadata instead of trying to launch the removed path. Override jest-runner-vscode's transitive @vscode/test-electron dependency as well. Its declared 2.x range would otherwise cause npm to install a private 2.5.2 copy and leave the runner using the broken executable lookup despite the direct dependency upgrade. Increase the minimal-workspace activation polling and Jest timeouts because extension activation under VS Code 1.131 can take longer on macOS than the previous 30-second allowance. This preserves the activation assertion while avoiding a deterministic timeout on slower macOS hosts. These failures were observed only in local macOS runs. GitHub Actions runs the VS Code integration suite on Linux and Windows, where the existing tests were passing. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: d7e3c611-18b2-4bf2-8f9a-09e7a8d1ef8e
1 parent 8468455 commit f15c770

3 files changed

Lines changed: 12 additions & 9 deletions

File tree

extensions/ql-vscode/package-lock.json

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

extensions/ql-vscode/package.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2149,7 +2149,7 @@
21492149
"@types/yauzl": "^3.4.0",
21502150
"@typescript-eslint/eslint-plugin": "^8.65.0",
21512151
"@typescript-eslint/parser": "^8.65.0",
2152-
"@vscode/test-electron": "^2.5.2",
2152+
"@vscode/test-electron": "^3.1.0",
21532153
"@vscode/vsce": "^3.9.2",
21542154
"ansi-colors": "^4.1.1",
21552155
"applicationinsights": "^2.9.8",
@@ -2198,7 +2198,10 @@
21982198
"d3-graphviz": {
21992199
"@hpcc-js/wasm": "2.30.0"
22002200
},
2201-
"@azure/identity": "^4.13.1"
2201+
"@azure/identity": "^4.13.1",
2202+
"jest-runner-vscode": {
2203+
"@vscode/test-electron": "^3.1.0"
2204+
}
22022205
},
22032206
"lint-staged": {
22042207
"./**/*.{json,css,scss}": [

extensions/ql-vscode/test/vscode-tests/minimal-workspace/activation.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ describe("launching with a minimal workspace", () => {
2424
const document = await workspace.openTextDocument(documentPath);
2525
expect(document.languageId).toEqual("ql");
2626
// Wait for the extension to activate, polling with a timeout.
27-
await waitForActivation(ext!, 30_000);
27+
await waitForActivation(ext!, 90_000);
2828
expect(ext!.isActive).toBeTruthy();
29-
}, 60_000);
29+
}, 120_000);
3030

3131
async function waitForActivation(
3232
extension: Extension<any>,

0 commit comments

Comments
 (0)