fix(test): honor command overrides after bootstrap reload

bolens · cursoragent · bolens · commit 049df19c0cb2 · 2026-07-18T10:22:28.000-06:00
Bootstrap redefines Test-CachedCommand mid-shard, so availability
stubs stopped applying and real tools leaked into isolation tests.

Co-authored-by: Cursor &lt;cursoragent@cursor.com&gt;
diff --git a/profile.d/bootstrap/CloudProviderBase.ps1 b/profile.d/bootstrap/CloudProviderBase.ps1
@@ -496,8 +496,9 @@ try {
             }
         }
         else {
-            Write-Error "Either Service/Action or Arguments must be provided."
-            return $null
+            $missingArgsMessage = 'Either Service/Action or Arguments must be provided.'
+            Write-Error $missingArgsMessage
+            throw $missingArgsMessage
         }
 
         # Build context
diff --git a/profile.d/bootstrap/CommandCache.ps1 b/profile.d/bootstrap/CommandCache.ps1
@@ -50,13 +50,32 @@ function global:Test-CachedCommand {
     }
 
     $normalizedName = $Name.Trim()
+    $cacheKey = $normalizedName.ToLowerInvariant()
+
+    # Test harness overrides win over assumed commands / real lookups so
+    # Mark-TestCommandsUnavailable still works after bootstrap redefines this function.
+    if ($env:PS_PROFILE_TEST_MODE -eq '1') {
+        $overrideTable = Get-Variable -Name 'TestCommandAvailabilityOverrides' -Scope Global -ErrorAction SilentlyContinue
+        if ($null -ne $overrideTable -and $null -ne $overrideTable.Value) {
+            $overrides = $overrideTable.Value
+            if ($overrides.ContainsKey($normalizedName)) {
+                return [bool]$overrides[$normalizedName]
+            }
+            if ($overrides.ContainsKey($cacheKey)) {
+                return [bool]$overrides[$cacheKey]
+            }
+        }
+    }
 
     # Check assumed commands first (bypasses actual command lookup for optional tools)
     if ($global:AssumedAvailableCommands -and $global:AssumedAvailableCommands.ContainsKey($normalizedName)) {
+        $assumed = $global:AssumedAvailableCommands[$normalizedName]
+        if ($assumed -is [bool]) {
+            return $assumed
+        }
         return $true
     }
 
-    $cacheKey = $normalizedName.ToLowerInvariant()
     $now = Get-Date
 
     # Check cache for existing entry that hasn't expired (if caching enabled)
diff --git a/profile.d/system/NetworkOperations.ps1 b/profile.d/system/NetworkOperations.ps1
@@ -22,8 +22,9 @@ function Get-NetworkPorts {
     else {
         try {
             if (-not (Test-CachedCommand 'netstat')) {
-                Write-Error "netstat command not found. This command is typically available on Windows and Unix systems."
-                return
+                $missingNetstat = 'netstat command not found. This command is typically available on Windows and Unix systems.'
+                Write-Error $missingNetstat
+                throw $missingNetstat
             }
             & netstat -an
         }
diff --git a/tests/TestSupport/TestCommandAvailability.ps1 b/tests/TestSupport/TestCommandAvailability.ps1
@@ -4,22 +4,29 @@
 # ===============================================
 
 $script:OriginalTestCachedCommand = $null
+$script:StubbedTestCachedCommand = $null
 $script:TestCachedCommandStubInstalled = $false
 
 <#
 .SYNOPSIS
     Installs a function wrapper for Test-CachedCommand that honors availability overrides.
 #>
 function Register-TestCommandAvailabilityStub {
-    if ($script:TestCachedCommandStubInstalled) {
-        return
-    }
-
     $existing = Get-Command Test-CachedCommand -ErrorAction SilentlyContinue
     if (-not $existing -or $existing.CommandType -ne 'Function') {
         return
     }
 
+    # Bootstrap/profile often redefines Test-CachedCommand; re-wrap when that happens.
+    if ($script:TestCachedCommandStubInstalled -and $script:StubbedTestCachedCommand) {
+        $currentBlock = $existing.ScriptBlock
+        if ($currentBlock -eq $script:StubbedTestCachedCommand) {
+            return
+        }
+        $script:OriginalTestCachedCommand = $currentBlock
+        $script:TestCachedCommandStubInstalled = $false
+    }
+
     if (-not $script:OriginalTestCachedCommand) {
         $script:OriginalTestCachedCommand = $existing.ScriptBlock
     }
@@ -57,6 +64,7 @@ function Register-TestCommandAvailabilityStub {
     }.GetNewClosure()
 
     Set-Item -Path 'Function:\global:Test-CachedCommand' -Value $wrapper -Force -ErrorAction SilentlyContinue
+    $script:StubbedTestCachedCommand = $wrapper
     $script:TestCachedCommandStubInstalled = $true
 }
 
@@ -76,6 +84,7 @@ function Clear-TestCommandAvailabilityStub {
         Set-Item -Path 'Function:\global:Test-CachedCommand' -Value $script:OriginalTestCachedCommand -Force -ErrorAction SilentlyContinue
     }
 
+    $script:StubbedTestCachedCommand = $null
     $script:TestCachedCommandStubInstalled = $false
 }
 
diff --git a/tests/TestSupport/TestModuleLoading.ps1 b/tests/TestSupport/TestModuleLoading.ps1
@@ -1140,6 +1140,10 @@ function Initialize-SystemUtilityIntegration {
 
     Initialize-TestProfile -ProfileDir $ProfileDir -LoadBootstrap -LoadFilesFragment
 
+    if (Get-Command Register-TestCommandAvailabilityStub -ErrorAction SilentlyContinue) {
+        Register-TestCommandAvailabilityStub
+    }
+
     $systemFragment = Join-Path $ProfileDir 'system.ps1'
     if (Test-Path -LiteralPath $systemFragment) {
         $null = . $systemFragment
diff --git a/tests/unit/library/path/library-path-resolution-extended.tests.ps1 b/tests/unit/library/path/library-path-resolution-extended.tests.ps1
@@ -142,14 +142,8 @@ Describe 'PathResolution extended scenarios' {
 
             try {
                 InModuleScope -ModuleName PathResolution {
-                    Mock Get-Command {
-                        param($Name)
-                        if ($Name -eq 'Exit-WithCode') {
-                            return $null
-                        }
-
-                        return Microsoft.PowerShell.Core\Get-Command @PSBoundParameters
-                    }
+                    # ParameterFilter avoids Mock Get-Command recursion (stack overflow under coverage).
+                    Mock Get-Command -ParameterFilter { $Name -eq 'Exit-WithCode' } -MockWith { $null }
 
                     { Get-RepoRootSafe -ScriptPath $using:invalidPath -ExitOnError } | Should -Throw
                 }
@@ -376,14 +370,8 @@ Describe 'PathResolution extended scenarios' {
 
             try {
                 InModuleScope -ModuleName PathResolution {
-                    Mock Get-Command {
-                        param($Name)
-                        if ($Name -eq 'Exit-WithCode') {
-                            return $null
-                        }
-
-                        return Microsoft.PowerShell.Core\Get-Command @PSBoundParameters
-                    }
+                    # ParameterFilter avoids Mock Get-Command recursion (stack overflow under coverage).
+                    Mock Get-Command -ParameterFilter { $Name -eq 'Exit-WithCode' } -MockWith { $null }
 
                     { Get-RepoRootSafe -ScriptPath $using:invalidPath -ExitOnError } | Should -Throw
                 }
@@ -472,14 +460,8 @@ Describe 'PathResolution extended scenarios' {
 
             try {
                 InModuleScope -ModuleName PathResolution {
-                    Mock Get-Command {
-                        param($Name)
-                        if ($Name -eq 'Exit-WithCode') {
-                            return $null
-                        }
-
-                        return Microsoft.PowerShell.Core\Get-Command @PSBoundParameters
-                    }
+                    # ParameterFilter avoids Mock Get-Command recursion (stack overflow under coverage).
+                    Mock Get-Command -ParameterFilter { $Name -eq 'Exit-WithCode' } -MockWith { $null }
 
                     { Get-RepoRootSafe -ScriptPath $using:invalidPath -ExitOnError } | Should -Throw
                 }
@@ -629,14 +611,8 @@ Describe 'PathResolution extended scenarios' {
                 InModuleScope -ModuleName PathResolution -ArgumentList $invalidPath {
                     param([string]$InvalidPath)
 
-                    Mock Get-Command {
-                        param($Name)
-                        if ($Name -eq 'Exit-WithCode') {
-                            return $null
-                        }
-
-                        return Microsoft.PowerShell.Core\Get-Command @PSBoundParameters
-                    }
+                    # ParameterFilter avoids Mock Get-Command recursion (stack overflow under coverage).
+                    Mock Get-Command -ParameterFilter { $Name -eq 'Exit-WithCode' } -MockWith { $null }
 
                     { Get-RepoRootSafe -ScriptPath $InvalidPath -ExitOnError } | Should -Throw
                 }
diff --git a/tests/unit/library/python/library-python-extended.tests.ps1 b/tests/unit/library/python/library-python-extended.tests.ps1
@@ -36,6 +36,30 @@ function script:New-FakePythonExecutable {
         [int]$ScriptExitCode = 0
     )
 
+    # Windows CI cannot execute .sh probes via `& path`; use a .cmd shim there.
+    if ($IsWindows -or $env:OS -eq 'Windows_NT') {
+        $exePath = Join-Path $script:TempDir ("fake-python-{0}.cmd" -f (Get-Random))
+        $lines = New-Object System.Collections.Generic.List[string]
+        $null = $lines.Add('@echo off')
+        $null = $lines.Add('setlocal EnableExtensions')
+        $null = $lines.Add('if /I "%~1"=="--version" (')
+        $null = $lines.Add('  echo Python 3.11.0')
+        $null = $lines.Add("  exit /b $VersionExitCode")
+        $null = $lines.Add(')')
+        foreach ($entry in $PackageExitCodes.GetEnumerator()) {
+            $pkg = $entry.Key
+            $code = [int]$entry.Value
+            $null = $lines.Add("findstr /C:`"$pkg`" `"%~1`" >nul 2>&1 && exit /b $code")
+        }
+        $null = $lines.Add('if not "%~2"=="" if exist "%~2" (')
+        $null = $lines.Add("  echo $ScriptOutput")
+        $null = $lines.Add("  exit /b $ScriptExitCode")
+        $null = $lines.Add(')')
+        $null = $lines.Add('exit /b 0')
+        Set-Content -LiteralPath $exePath -Value ($lines -join "`r`n") -Encoding ASCII
+        return $exePath
+    }
+
     $exePath = Join-Path $script:TempDir ("fake-python-{0}.sh" -f (Get-Random))
     $lines = New-Object System.Collections.Generic.List[string]
     $null = $lines.Add('#!/bin/sh')

Original file line number	Diff line number	Diff line change
`@@ -496,8 +496,9 @@ try {`
`496`	`496`	`}`
`497`	`497`	`}`
`498`	`498`	`else {`
`499`		`- Write-Error "Either Service/Action or Arguments must be provided."`
`500`		`- return $null`
	`499`	`+ $missingArgsMessage = 'Either Service/Action or Arguments must be provided.'`
	`500`	`+ Write-Error $missingArgsMessage`
	`501`	`+ throw $missingArgsMessage`
`501`	`502`	`}`
`502`	`503`
`503`	`504`	`# Build context`
Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,9 @@ function Get-NetworkPorts {`
`22`	`22`	`else {`
`23`	`23`	`try {`
`24`	`24`	`if (-not (Test-CachedCommand 'netstat')) {`
`25`		`- Write-Error "netstat command not found. This command is typically available on Windows and Unix systems."`
`26`		`- return`
	`25`	`+ $missingNetstat = 'netstat command not found. This command is typically available on Windows and Unix systems.'`
	`26`	`+ Write-Error $missingNetstat`
	`27`	`+ throw $missingNetstat`
`27`	`28`	`}`
`28`	`29`	`& netstat -an`
`29`	`30`	`}`