[release/v7.5] Fix $PSDefaultParameterValues leak causing tests to skip unexpectedly (#26823)

daxian-dbw · web-flow · commit 54b881d10699 · 2026-02-13T16:30:06.000-08:00
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Management/Rename-Computer.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/Rename-Computer.Tests.ps1
@@ -7,6 +7,7 @@ $DefaultResultValue = 0
 try
 {
     # set up for testing
+    $originalDefaultParameterValues = $PSDefaultParameterValues.Clone()
     $PSDefaultParameterValues["it:skip"] = ! $IsWindows
     Enable-Testhook -testhookName $RenameTesthook
     # we also set TestStopComputer
@@ -73,7 +74,7 @@ try
 }
 finally
 {
-    $PSDefaultParameterValues.Remove("it:skip")
+    $global:PSDefaultParameterValues = $originalDefaultParameterValues
     Disable-Testhook -testhookName $RenameTestHook
     Disable-Testhook -testhookName TestStopComputer
     Set-TesthookResult -testhookName $RenameResultName -value 0
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Security/AclCmdlets.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Security/AclCmdlets.Tests.ps1
@@ -3,6 +3,7 @@
 Describe "Acl cmdlets are available and operate properly" -Tag CI {
     Context "Windows ACL test" {
         BeforeAll {
+            $originalDefaultParameterValues = $PSDefaultParameterValues.Clone()
             $PSDefaultParameterValues["It:Skip"] = -not $IsWindows
         }
 
@@ -103,7 +104,7 @@ Describe "Acl cmdlets are available and operate properly" -Tag CI {
         }
 
         AfterAll {
-            $PSDefaultParameterValues.Remove("It:Skip")
+            $global:PSDefaultParameterValues = $originalDefaultParameterValues
         }
     }
 }
diff --git a/test/powershell/engine/ETS/CimAdapter.Tests.ps1 b/test/powershell/engine/ETS/CimAdapter.Tests.ps1
@@ -3,6 +3,8 @@
 
 Describe "CIM Objects are adapted properly" -Tag @("CI") {
     BeforeAll {
+        $originalDefaultParameterValues = $PSDefaultParameterValues.Clone()
+        
         function getIndex
         {
             param([string[]]$strings,[string]$pattern)
@@ -32,7 +34,7 @@ Describe "CIM Objects are adapted properly" -Tag @("CI") {
         }
     }
     AfterAll {
-        $PSDefaultParameterValues.Remove("it:pending")
+        $global:PSDefaultParameterValues = $originalDefaultParameterValues
     }
 
     It "Namespace-qualified Win32_Process is present" -Skip:(!$IsWindows) {
diff --git a/test/powershell/engine/Remoting/RemoteSession.Basic.Tests.ps1 b/test/powershell/engine/Remoting/RemoteSession.Basic.Tests.ps1
@@ -83,9 +83,7 @@ Describe "JEA session Transcript script test" -Tag @("Feature", 'RequireAdminOnW
     AfterAll {
         if ($skipTest) {
             Pop-DefaultParameterValueStack
-            return
         }
-        Pop-DefaultParameterValueStack
     }
 
     It "Configuration name should be in the transcript header" {
diff --git a/test/powershell/engine/Remoting/SessionOption.Tests.ps1 b/test/powershell/engine/Remoting/SessionOption.Tests.ps1
@@ -1,6 +1,7 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 try {
+    $originalDefaultParameterValues = $PSDefaultParameterValues.Clone()
     if ( ! $IsWindows ) {
         $PSDefaultParameterValues['it:skip'] = $true
     }
@@ -52,5 +53,5 @@ try {
     }
 }
 finally {
-    $PSDefaultParameterValues.remove("it:skip")
+    $global:PSDefaultParameterValues = $originalDefaultParameterValues
 }
diff --git a/test/powershell/engine/Security/FileSignature.Tests.ps1 b/test/powershell/engine/Security/FileSignature.Tests.ps1
@@ -89,6 +89,7 @@ Describe "Windows file content signatures" -Tags @('Feature', 'RequireAdminOnWin
 
     AfterAll {
         if ($shouldSkip) {
+            Pop-DefaultParameterValueStack
             return
         }
 

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ $DefaultResultValue = 0`
`7`	`7`	`try`
`8`	`8`	`{`
`9`	`9`	`# set up for testing`
	`10`	`+ $originalDefaultParameterValues = $PSDefaultParameterValues.Clone()`
`10`	`11`	`$PSDefaultParameterValues["it:skip"] = ! $IsWindows`
`11`	`12`	`Enable-Testhook -testhookName $RenameTesthook`
`12`	`13`	`# we also set TestStopComputer`
`@@ -73,7 +74,7 @@ try`
`73`	`74`	`}`
`74`	`75`	`finally`
`75`	`76`	`{`
`76`		`- $PSDefaultParameterValues.Remove("it:skip")`
	`77`	`+ $global:PSDefaultParameterValues = $originalDefaultParameterValues`
`77`	`78`	`Disable-Testhook -testhookName $RenameTestHook`
`78`	`79`	`Disable-Testhook -testhookName TestStopComputer`
`79`	`80`	`Set-TesthookResult -testhookName $RenameResultName -value 0`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`Describe "Acl cmdlets are available and operate properly" -Tag CI {`
`4`	`4`	`Context "Windows ACL test" {`
`5`	`5`	`BeforeAll {`
	`6`	`+ $originalDefaultParameterValues = $PSDefaultParameterValues.Clone()`
`6`	`7`	`$PSDefaultParameterValues["It:Skip"] = -not $IsWindows`
`7`	`8`	`}`
`8`	`9`
`@@ -103,7 +104,7 @@ Describe "Acl cmdlets are available and operate properly" -Tag CI {`
`103`	`104`	`}`
`104`	`105`
`105`	`106`	`AfterAll {`
`106`		`- $PSDefaultParameterValues.Remove("It:Skip")`
	`107`	`+ $global:PSDefaultParameterValues = $originalDefaultParameterValues`
`107`	`108`	`}`
`108`	`109`	`}`
`109`	`110`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,8 @@`
`3`	`3`
`4`	`4`	`Describe "CIM Objects are adapted properly" -Tag @("CI") {`
`5`	`5`	`BeforeAll {`
	`6`	`+ $originalDefaultParameterValues = $PSDefaultParameterValues.Clone()`
	`7`	`+`
`6`	`8`	`function getIndex`
`7`	`9`	`{`
`8`	`10`	`param([string[]]$strings,[string]$pattern)`
`@@ -32,7 +34,7 @@ Describe "CIM Objects are adapted properly" -Tag @("CI") {`
`32`	`34`	`}`
`33`	`35`	`}`
`34`	`36`	`AfterAll {`
`35`		`- $PSDefaultParameterValues.Remove("it:pending")`
	`37`	`+ $global:PSDefaultParameterValues = $originalDefaultParameterValues`
`36`	`38`	`}`
`37`	`39`
`38`	`40`	`It "Namespace-qualified Win32_Process is present" -Skip:(!$IsWindows) {`
Original file line number	Diff line number	Diff line change
`@@ -83,9 +83,7 @@ Describe "JEA session Transcript script test" -Tag @("Feature", 'RequireAdminOnW`
`83`	`83`	`AfterAll {`
`84`	`84`	`if ($skipTest) {`
`85`	`85`	`Pop-DefaultParameterValueStack`
`86`		`- return`
`87`	`86`	`}`
`88`		`- Pop-DefaultParameterValueStack`
`89`	`87`	`}`
`90`	`88`
`91`	`89`	`It "Configuration name should be in the transcript header" {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`# Copyright (c) Microsoft Corporation.`
`2`	`2`	`# Licensed under the MIT License.`
`3`	`3`	`try {`
	`4`	`+ $originalDefaultParameterValues = $PSDefaultParameterValues.Clone()`
`4`	`5`	`if ( ! $IsWindows ) {`
`5`	`6`	`$PSDefaultParameterValues['it:skip'] = $true`
`6`	`7`	`}`
`@@ -52,5 +53,5 @@ try {`
`52`	`53`	`}`
`53`	`54`	`}`
`54`	`55`	`finally {`
`55`		`- $PSDefaultParameterValues.remove("it:skip")`
	`56`	`+ $global:PSDefaultParameterValues = $originalDefaultParameterValues`
`56`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -89,6 +89,7 @@ Describe "Windows file content signatures" -Tags @('Feature', 'RequireAdminOnWin`
`89`	`89`
`90`	`90`	`AfterAll {`
`91`	`91`	`if ($shouldSkip) {`
	`92`	`+ Pop-DefaultParameterValueStack`
`92`	`93`	`return`
`93`	`94`	`}`
`94`	`95`