Skip to content
Merged
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
15 changes: 11 additions & 4 deletions packages/vscode/e2e/lint/suite-multiroot/multiroot.test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// Ported verbatim from web-infra-dev/rslint
// `packages/vscode-extension/__tests__/suite-multiroot/multiroot.test.ts` (origin/main).
// Ported from web-infra-dev/rslint
// `packages/vscode-extension/__tests__/suite-multiroot/multiroot.test.ts` (origin/main),
// with timing deviations documented inline (assertion semantics unchanged).
import * as assert from 'node:assert';
import path from 'node:path';
import * as vscode from 'vscode';
Expand Down Expand Up @@ -31,7 +32,11 @@ function rslintDiagnostics(document: vscode.TextDocument): vscode.Diagnostic[] {
async function waitForSingleRslintDiagnostic(
document: vscode.TextDocument,
): Promise<vscode.Diagnostic[]> {
const deadline = Date.now() + 30_000;
// Deviation from upstream (30s): an ownership handoff spawns a fresh lint
// worker for the new owning folder, and that cold start has exceeded 30s on
// GitHub's windows runners (CI run 32718392387). The assertion semantics are
// unchanged — only the deadline is wider.
const deadline = Date.now() + 60_000;
while (Date.now() < deadline) {
const diagnostics = rslintDiagnostics(document);
if (
Expand Down Expand Up @@ -63,7 +68,9 @@ async function waitForSingleRslintDiagnostic(
}

suite('VS Code multi-root ownership', function () {
this.timeout(60_000);
// Deviation from upstream (60s): the dynamic-ownership test below waits for
// up to three diagnostic publications, each with the widened 60s deadline.
this.timeout(240_000);

test('keeps same-name roots independent', async function () {
const appFolders = (vscode.workspace.workspaceFolders ?? []).filter(
Expand Down