From 25a32284dd47b9e8af1cc9b0a337754a3b31ebb4 Mon Sep 17 00:00:00 2001 From: Steve Lee Date: Sat, 23 Sep 2017 13:48:51 -0700 Subject: [PATCH] fix tests not setting back $psdefaultparametervalues back correctly (#4892) --- test/powershell/Language/Parser/RedirectionOperator.Tests.ps1 | 4 ++-- .../CertificateProvider.Tests.ps1 | 4 ++-- .../Microsoft.PowerShell.Security/CmsMessage.Tests.ps1 | 2 +- .../Microsoft.PowerShell.Security/SecureString.Tests.ps1 | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test/powershell/Language/Parser/RedirectionOperator.Tests.ps1 b/test/powershell/Language/Parser/RedirectionOperator.Tests.ps1 index b492cb7580..3687a899b5 100644 --- 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 index 5cf1224a4f..e913bf2384 100644 --- 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 index 2530da4a41..5b2a99e05c 100644 --- 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 index c7af0a122c..fbd7ff7982 100644 --- 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" {