fix tests not setting back $psdefaultparametervalues back correctly (PowerShell#4892)

SteveL-MSFT · TravisEz13 · commit 25a32284dd47 · 2017-09-23T13:48:51.000-07:00
diff --git a/test/powershell/Language/Parser/RedirectionOperator.Tests.ps1 b/test/powershell/Language/Parser/RedirectionOperator.Tests.ps1
@@ -13,12 +13,12 @@ Describe "Redirection operator now supports encoding changes" -Tags "CI" {
         # If out-file -encoding happens to have a default, be sure to
         # save it away
         $SavedValue = $null
-        $oldDefaultParameterValues = $psDefaultParameterValues
+        $oldDefaultParameterValues = $psDefaultParameterValues.Clone()
         $psDefaultParameterValues = @{}
     }
     AfterAll {
         # be sure to tidy up afterwards
-        $psDefaultParameterValues = $oldDefaultParameterValues
+        $global:psDefaultParameterValues = $oldDefaultParameterValues
     }
     BeforeEach {
         # start each test with a clean plate!
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Security/CertificateProvider.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Security/CertificateProvider.Tests.ps1
@@ -36,7 +36,7 @@ Describe "Certificate Provider tests" -Tags "CI" {
     AfterAll {
         if(!$IsWindows)
         {
-            $PSdefaultParameterValues = $defaultParamValues
+            $global:PSdefaultParameterValues = $defaultParamValues
         }
     }
 
@@ -98,7 +98,7 @@ Describe "Certificate Provider tests" -Tags "Feature" {
         }
         else
         {
-            $PSdefaultParameterValues = $defaultParamValues
+            $global:PSdefaultParameterValues = $defaultParamValues
         }
     }
 
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Security/CmsMessage.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Security/CmsMessage.Tests.ps1
@@ -81,7 +81,7 @@ Describe "CmsMessage cmdlets thorough tests" -Tags "Feature" {
         }
         else
         {
-            $PSdefaultParameterValues = $defaultParamValues
+            $global:PSdefaultParameterValues = $defaultParamValues
         }
     }
 
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Security/SecureString.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Security/SecureString.Tests.ps1
@@ -8,7 +8,7 @@ Describe "SecureString conversion tests" -Tags "CI" {
         if ( ! $IsWindows ) { $PSdefaultParameterValues["it:pending"] = $true }
     }
     AfterAll {
-        $PSdefaultParameterValues = $defaultParamValues
+        $global:PSdefaultParameterValues = $defaultParamValues
     }
 
     It "using null arguments to ConvertFrom-SecureString produces an exception" {

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ Describe "Certificate Provider tests" -Tags "CI" {`
`36`	`36`	`AfterAll {`
`37`	`37`	`if(!$IsWindows)`
`38`	`38`	`{`
`39`		`- $PSdefaultParameterValues = $defaultParamValues`
	`39`	`+ $global:PSdefaultParameterValues = $defaultParamValues`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`
`@@ -98,7 +98,7 @@ Describe "Certificate Provider tests" -Tags "Feature" {`
`98`	`98`	`}`
`99`	`99`	`else`
`100`	`100`	`{`
`101`		`- $PSdefaultParameterValues = $defaultParamValues`
	`101`	`+ $global:PSdefaultParameterValues = $defaultParamValues`
`102`	`102`	`}`
`103`	`103`	`}`
`104`	`104`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ Describe "CmsMessage cmdlets thorough tests" -Tags "Feature" {`
`81`	`81`	`}`
`82`	`82`	`else`
`83`	`83`	`{`
`84`		`- $PSdefaultParameterValues = $defaultParamValues`
	`84`	`+ $global:PSdefaultParameterValues = $defaultParamValues`
`85`	`85`	`}`
`86`	`86`	`}`
`87`	`87`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ Describe "SecureString conversion tests" -Tags "CI" {`
`8`	`8`	`if ( ! $IsWindows ) { $PSdefaultParameterValues["it:pending"] = $true }`
`9`	`9`	`}`
`10`	`10`	`AfterAll {`
`11`		`- $PSdefaultParameterValues = $defaultParamValues`
	`11`	`+ $global:PSdefaultParameterValues = $defaultParamValues`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`It "using null arguments to ConvertFrom-SecureString produces an exception" {`