Skip to content
Merged
Show file tree
Hide file tree
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
7 changes: 6 additions & 1 deletion scripts/verify-desktop-installed-update.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -547,11 +547,16 @@ try {
$restartSidecarUrl = Get-SidecarUrl $restartPages
$sidecarUrl = $restartSidecarUrl
$journalAfter = Read-JournalIdentity $journalPath
# A fully reconciled plan is cleared during startup; the recovered state is
# validated by the driver before this evidence is accepted.
$journalRecovered = $null -ne $journalBefore -and (
$null -eq $journalAfter -or $journalBefore -eq $journalAfter
)
Write-JsonAtomic $controlPath @{
schemaVersion = 1
phase = $control.phase
status = 'relaunched'
journalRecovered = ($null -ne $journalBefore -and $journalBefore -eq $journalAfter)
journalRecovered = $journalRecovered
cdpUrl = "http://127.0.0.1:$cdpPort"
sidecarUrl = $restartSidecarUrl
}
Expand Down
2 changes: 2 additions & 0 deletions scripts/verify-desktop-installed-update.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,8 @@ describe("verify-desktop-installed-update", () => {
expect(runner).toContain("$cdpPort = Get-FreeTcpPort");
expect(runner).toContain('cdpUrl = "http://127.0.0.1:$cdpPort"');
expect(runner).toContain("sidecarUrl = $restartSidecarUrl");
expect(runner).toContain("$null -eq $journalAfter -or $journalBefore -eq $journalAfter");
expect(runner).toContain("journalRecovered = $journalRecovered");
expect(runner).toContain("Stop-InstalledDesktopExecutable $Executable $CdpPort");
expect(runner).toContain(
"$lastInstallerCount = @(Get-InstallerProcesses $InstallerFileName).Count"
Expand Down
Loading