Skip to content

Allow WSL follow-up bootstrap to settle #195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pallyoung merged 1 commit into from
Aug 25, 2026
Merged

Allow WSL follow-up bootstrap to settle #195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion scripts/verify-desktop-installed-update.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,7 +543,8 @@ try {
}
$desktopProcess = Start-AcceptanceDesktop $desktopExecutable $userDataDirectory $cdpPort $restartScenario $WslDistro $desktopOut $desktopErr
$desktopProcess.Handle | Out-Null
$restartPages = Wait-Cdp $cdpPort
$restartTimeoutSeconds = if ($phase -eq 'wsl-follow') { 300 } else { 90 }
$restartPages = Wait-Cdp $cdpPort $restartTimeoutSeconds
$restartSidecarUrl = Get-SidecarUrl $restartPages
$sidecarUrl = $restartSidecarUrl
$journalAfter = Read-JournalIdentity $journalPath
Expand Down
5 changes: 5 additions & 0 deletions scripts/verify-desktop-installed-update.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,10 @@ describe("verify-desktop-installed-update", () => {
expect(runner).toContain("-RedirectStandardOutput $StandardOut");
expect(runner).toContain("$startupTimeoutSeconds = if ($isWslScenario) { 300 } else { 90 }");
expect(runner).toContain("Wait-Cdp $cdpPort $startupTimeoutSeconds");
expect(runner).toContain(
"$restartTimeoutSeconds = if ($phase -eq 'wsl-follow') { 300 } else { 90 }"
);
expect(runner).toContain("Wait-Cdp $cdpPort $restartTimeoutSeconds");
expect(desktopMain).toContain('console.error("Unable to start Coder Studio", details)');
expect(desktopMain).toContain("[desktop-acceptance:environment]");
expect(desktopMain).toContain(
Expand Down Expand Up @@ -183,6 +187,7 @@ describe("verify-desktop-installed-update", () => {
expect(driver).toContain("activeSidecarUrl = relaunch.sidecarUrl ?? activeSidecarUrl;");
expect(driver).toContain("await session.close().catch(() => undefined);");
expect(driver).toContain("session = await connectBrowser(activeCdpUrl);");
expect(driver).toContain('phase === "wsl-follow" ? 360_000 : 120_000');
expect(driver).toContain("allowFailedFrozenState?: boolean;");
expect(driver).toContain('values.get("allow-failed-frozen-state") === "true"');
expect(driver).toContain(
Expand Down
3 changes: 2 additions & 1 deletion scripts/verify-desktop-installed-update.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -611,7 +611,8 @@ async function waitForRelaunch(
): Promise<InstalledDesktopRelaunchInfo> {
if (!path) throw new Error(`Installed Desktop interruption control is required for ${phase}`);
const controlPath = resolve(path);
const deadline = Date.now() + 120_000;
const relaunchTimeoutMs = phase === "wsl-follow" ? 360_000 : 120_000;
const deadline = Date.now() + relaunchTimeoutMs;
while (Date.now() < deadline) {
try {
const state = JSON.parse(
Expand Down
Loading