diff --git a/desktop/build/recover-legacy-install-data.ps1 b/desktop/build/recover-legacy-install-data.ps1 index 617d8167..7d155909 100644 --- a/desktop/build/recover-legacy-install-data.ps1 +++ b/desktop/build/recover-legacy-install-data.ps1 @@ -790,20 +790,6 @@ function Run-SelfTest { } Assert-SelfTest -Condition $possibleShortAliasFailed -Message 'possible 8.3 alias did not fail closed' - $existingShortAlias = Join-Path ([IO.Path]::GetPathRoot($testRoot)) 'PROGRA~1' - if ([IO.Directory]::Exists($existingShortAlias) -or [IO.File]::Exists($existingShortAlias)) { - $existingShortAliasFailed = $false - try { - Resolve-CanonicalPath -Path $existingShortAlias | Out-Null - } catch { - $existingShortAliasFailed = ( - $_.Exception.Message.Contains('Alternate path alias') -or - $_.Exception.Message.Contains('8.3 path alias') - ) - } - Assert-SelfTest -Condition $existingShortAliasFailed -Message 'existing 8.3 alias did not fail closed' - } - $legalTildePath = Join-Path $testRoot 'project~notes' New-Item -ItemType Directory -Path $legalTildePath | Out-Null $resolvedLegalTildePath = Resolve-CanonicalPath -Path $legalTildePath diff --git a/scripts/pr/windows-installer-recovery.test.ts b/scripts/pr/windows-installer-recovery.test.ts index af35ccdf..24cfda7c 100644 --- a/scripts/pr/windows-installer-recovery.test.ts +++ b/scripts/pr/windows-installer-recovery.test.ts @@ -23,8 +23,8 @@ describe('Windows installer recovery prerequisites', () => { expect(recoveryHelper).toContain("([string]$_.Name).Equals($segment") expect(recoveryHelper).toContain("Join-Path $testRoot 'project~notes'") expect(recoveryHelper).toContain("Join-Path $testRoot 'MISSIN~1'") + expect(recoveryHelper).not.toContain("'PROGRA~1'") expect(recoveryHelper).toContain('possible 8.3 alias did not fail closed') - expect(recoveryHelper).toContain('existing 8.3 alias did not fail closed') expect(recoveryHelper).toContain('legal long directory name containing a tilde') expect(recoveryHelper).toContain('extended volume alias did not fail closed') expect(recoveryHelper).toContain('SUBST alias did not fail closed')