Skip to content

Commit ade85b4

Browse files
adityapatwardhanadityapatwardhan
authored
Multiple test fixes and improved logging for fragile tests (PowerShell#9569)
1 parent 72db71b commit ade85b4

10 files changed

Lines changed: 69 additions & 33 deletions

File tree

‎test/powershell/Host/ConsoleHost.Tests.ps1‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -772,16 +772,20 @@ public enum ShowWindowCommands : int
772772
@{WindowStyle="Maximized"} # hidden doesn't work in CI/Server Core
773773
) {
774774
param ($WindowStyle)
775-
$ps = Start-Process pwsh -ArgumentList "-WindowStyle $WindowStyle -noexit -interactive" -PassThru
776-
$startTime = Get-Date
777-
$showCmd = "Unknown"
778-
while (((Get-Date) - $startTime).TotalSeconds -lt 10 -and $showCmd -ne $WindowStyle)
779-
{
780-
Start-Sleep -Milliseconds 100
781-
$showCmd = ([Test.User32]::GetPlacement($ps.MainWindowHandle)).showCmd
775+
776+
try {
777+
$ps = Start-Process pwsh -ArgumentList "-WindowStyle $WindowStyle -noexit -interactive" -PassThru
778+
$startTime = Get-Date
779+
$showCmd = "Unknown"
780+
while (((Get-Date) - $startTime).TotalSeconds -lt 10 -and $showCmd -ne $WindowStyle) {
781+
Start-Sleep -Milliseconds 100
782+
$showCmd = ([Test.User32]::GetPlacement($ps.MainWindowHandle)).showCmd
783+
}
784+
785+
$showCmd | Should -BeExactly $WindowStyle
786+
} finally {
787+
$ps | Stop-Process -Force
782788
}
783-
$showCmd | Should -BeExactly $WindowStyle
784-
$ps | Stop-Process -Force
785789
}
786790

787791
It "Invalid -WindowStyle returns error" {

‎test/powershell/Host/Read-Host.Tests.ps1‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,16 @@ Describe "Read-Host" -Tags "Slow","Feature" {
1212
} else {
1313
$ItArgs = @{ }
1414
}
15+
16+
$expectFile = Join-Path $assetsDir "Read-Host.Output.expect"
17+
18+
if (-not $IsWindows) {
19+
chmod a+x $expectFile
20+
}
1521
}
1622

1723
It @ItArgs "Should output correctly" {
18-
& (Join-Path $assetsDir "Read-Host.Output.expect") $powershell | Out-Null
24+
& $expectFile $powershell | Out-Null
1925
$LASTEXITCODE | Should -Be 0
2026
}
2127
}

‎test/powershell/Language/Interop/DotNet/DotNetAPI.Tests.ps1‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ Describe "DotNetAPI" -Tags "CI" {
2727
}
2828

2929
It "Should access types in System.Console" {
30-
[System.Console]::TreatControlCAsInput | Should -BeFalse
30+
$type = "System.Console" -as [type]
31+
$type.GetTypeInfo().FullName | Should -BeExactly "System.Console"
3132
}
3233
}

‎test/powershell/Modules/Microsoft.PowerShell.Management/FileSystem.Tests.ps1‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,10 +247,11 @@ Describe "Basic FileSystem Provider Tests" -Tags "CI" {
247247
$protectedPath = Join-Path ([environment]::GetFolderPath("windows")) "appcompat" "Programs"
248248
$protectedPath2 = Join-Path $protectedPath "Install"
249249
$newItemPath = Join-Path $protectedPath "foo"
250+
$shouldSkip = -not (Test-Path $protectedPath)
250251
}
251252
}
252253

253-
It "Access-denied test for <cmdline>" -Skip:(-not $IsWindows) -TestCases @(
254+
It "Access-denied test for <cmdline>" -Skip:(-not $IsWindows -or $shouldSkip) -TestCases @(
254255
# NOTE: ensure the fileNameBase parameter is unique for each test case; it is used to generate a unique error and done file name.
255256
# The following test does not consistently work on windows
256257
# @{cmdline = "Get-Item $protectedPath2 -ErrorAction Stop"; expectedError = "ItemExistsUnauthorizedAccessError,Microsoft.PowerShell.Commands.GetItemCommand"}

‎test/powershell/Modules/Microsoft.PowerShell.Security/ExecutionPolicy.Tests.ps1‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -654,7 +654,7 @@ ZoneId=$FileType
654654
Test-UnrestrictedExecutionPolicy $testScript $expected
655655
}
656656

657-
$error = "UnauthorizedAccess,Microsoft.PowerShell.Commands.ImportModuleCommand"
657+
$expectedError = "UnauthorizedAccess,Microsoft.PowerShell.Commands.ImportModuleCommand"
658658

659659
$testData = @(
660660
@{
@@ -666,8 +666,9 @@ ZoneId=$FileType
666666
if (Test-CanWriteToPsHome) {
667667
$testData += @(
668668
@{
669+
shouldMarkAsPending = $true
669670
module = $PSHomeUntrustedModule
670-
error = $null
671+
expectedError = $expectedError
671672
}
672673
@{
673674
module = $PSHomeUnsignedModule
@@ -678,15 +679,23 @@ ZoneId=$FileType
678679

679680
$TestTypePrefix = "Test 'Unrestricted' execution policy."
680681
It "$TestTypePrefix Importing <module> Module should throw '<error>'" -TestCases $testData {
681-
param([string]$module, [string]$error)
682-
$testScript = {Import-Module -Name $module -Force}
683-
if($error)
682+
param([string]$module, [string]$expectedError, [bool]$shouldMarkAsPending)
683+
684+
if ($shouldMarkAsPending)
684685
{
685-
$testScript | Should -Throw -ErrorId $error
686+
Set-ItResult -Pending -Because "Test is unreliable"
687+
}
688+
689+
$execPolicy = Get-ExecutionPolicy -List | Out-String
690+
691+
$testScript = {Import-Module -Name $module -Force -ErrorAction Stop}
692+
if($expectedError)
693+
{
694+
$testScript | Should -Throw -ErrorId $expectedError -Because "Untrusted modules should not be loaded even on unrestricted execution policy"
686695
}
687696
else
688697
{
689-
{& $testScript} | Should -Not -Throw
698+
$testScript | Should -Not -Throw -Because "Execution Policy is set as: $execPolicy"
690699
}
691700
}
692701
}

‎test/powershell/Modules/Microsoft.PowerShell.Utility/Get-Command.Tests.ps1‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ Describe "Get-Command Feature tests" -Tag Feature {
7474
It "Can return multiple results for cmdlets matching abbreviation" {
7575
# use mixed casing to validate case insensitivity
7676
$results = pwsh -outputformat xml -settingsfile $configFilePath -command "Get-Command i-C -UseAbbreviationExpansion"
77-
$results.Count | Should -BeGreaterOrEqual 3
7877
$results.Name | Should -Contain "Invoke-Command"
7978
$results.Name | Should -Contain "Import-Clixml"
8079
$results.Name | Should -Contain "Import-Csv"

‎test/powershell/Modules/Microsoft.PowerShell.Utility/MarkdownCmdlets.Tests.ps1‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ Describe 'ConvertFrom-Markdown tests' -Tags 'CI' {
66
BeforeAll {
77
$esc = [char]0x1b
88

9+
$hostSupportsVT100 = $Host.UI.SupportsVirtualTerminal
10+
911
function GetExpectedString
1012
{
1113
[CmdletBinding()]
@@ -27,6 +29,10 @@ Describe 'ConvertFrom-Markdown tests' -Tags 'CI' {
2729
[bool] $VT100Support
2830
)
2931

32+
# Force VT100Support to be false if the host does not support it.
33+
# This makes the expected string to be correct.
34+
$VT100Support = $VT100Support -and $hostSupportsVT100
35+
3036
switch($elementType)
3137
{
3238
"Header1" { if($VT100Support) {"$esc[7m$text$esc[0m`n`n" } else {"$text`n`n"} }
@@ -125,7 +131,11 @@ Describe 'ConvertFrom-Markdown tests' -Tags 'CI' {
125131
BeforeAll {
126132
$mdFile = New-Item -Path $TestDrive/input.md -Value "Some **test string** to write in a file" -Force
127133
$mdLiteralPath = New-Item -Path $TestDrive/LiteralPath.md -Value "Some **test string** to write in a file" -Force
128-
$expectedStringFromFile = "Some $esc[1mtest string$esc[0m to write in a file`n`n"
134+
$expectedStringFromFile = if ($hostSupportsVT100) {
135+
"Some $esc[1mtest string$esc[0m to write in a file`n`n"
136+
} else {
137+
"Some test string to write in a file`n`n"
138+
}
129139

130140
$codeBlock = @'
131141
```
@@ -294,8 +304,8 @@ bool function()`n{`n}
294304
@{Type = "Header4"; Markdown = "#### "; ExpectedOutput = ''}
295305
@{Type = "Header5"; Markdown = "##### "; ExpectedOutput = ''}
296306
@{Type = "Header6"; Markdown = "###### "; ExpectedOutput = ''}
297-
@{Type = "Image"; Markdown = "'![]()'"; ExpectedOutput = "'$esc[33m[Image]$esc[0m'"}
298-
@{Type = "Link"; Markdown = "'[]()'"; ExpectedOutput = "'$esc[4;38;5;117m`"`"$esc[0m'"}
307+
@{Type = "Image"; Markdown = "'![]()'"; ExpectedOutput = if ($hostSupportsVT100) {"'$esc[33m[Image]$esc[0m'"} else {"'[Image]'"}}
308+
@{Type = "Link"; Markdown = "'[]()'"; ExpectedOutput = if ($hostSupportsVT100) {"'$esc[4;38;5;117m`"`"$esc[0m'"} else {"'`"`"'"}}
299309
)
300310
}
301311

‎test/powershell/engine/Api/BasicEngine.Tests.ps1‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,19 +45,21 @@ $rs.Open()
4545
$ps = [powershell]::Create()
4646
$ps.RunspacePool = $rs
4747
$null = $ps.AddScript(1).Invoke()
48-
write-host should_not_stop_responding_at_exit
48+
"should_not_stop_responding_at_exit"
4949
exit
5050
'@
51-
$process = Start-Process pwsh -ArgumentList $command -PassThru
51+
$outputFile = New-Item -Path $TestDrive\output.txt -ItemType File
52+
$process = Start-Process pwsh -ArgumentList $command -PassThru -RedirectStandardOutput $outputFile
5253
Wait-UntilTrue -sb { $process.HasExited } -TimeoutInMilliseconds 5000 -IntervalInMilliseconds 1000 | Should -BeTrue
54+
$hasExited = $process.HasExited
5355

54-
$expect = "powershell process exits in 5 seconds"
55-
if (-not $process.HasExited) {
56-
Stop-Process -InputObject $process -Force -ErrorAction SilentlyContinue
57-
"powershell process doesn't exit in 5 seconds" | Should -Be $expect
58-
} else {
59-
$expect | Should -Be $expect
56+
$verboseMessage = Get-Content $outputFile
57+
58+
if (-not $hasExited) {
59+
Stop-Process $process -Force
6060
}
61+
62+
$hasExited | Should -BeTrue -Because "Process did not exit in 5 seconds as: $verboseMessage"
6163
}
6264
}
6365

‎test/powershell/engine/Api/TaskBasedAsyncPowerShellAPI.Tests.ps1‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,10 +207,14 @@ try {
207207
try {
208208
$ir = $ps.AddScript("Start-Sleep -Seconds 60").InvokeAsync()
209209
Wait-UntilTrue { $ps.InvocationStateInfo.State -eq [System.Management.Automation.PSInvocationState]::Running } | Should -BeTrue
210+
$ps.InvocationStateInfo.State | Should -Be 'Running'
211+
Start-Sleep -Seconds 1 # add a sleep to wait for pipeline to start executing the command.
210212
$sr = $ps.StopAsync($null, $null)
211213
[System.Threading.Tasks.Task]::WaitAll(@($sr))
214+
$ps.Streams.Error | Should -HaveCount 0 -Because ($ps.Streams.Error | Out-String)
215+
$ps.Commands.Commands.commandtext | Should -Be "Start-Sleep -Seconds 60"
212216
$sr.IsCompletedSuccessfully | Should -Be $true
213-
$ir.IsFaulted | Should -Be $true
217+
$ir.IsFaulted | Should -Be $true -Because ($ir | Format-List -Force * | Out-String)
214218
$ir.Exception -is [System.AggregateException] | Should -Be $true
215219
$ir.Exception.InnerException -is [System.Management.Automation.PipelineStoppedException] | Should -Be $true
216220
$ps.InvocationStateInfo.State | Should -Be ([System.Management.Automation.PSInvocationState]::Stopped)

‎test/powershell/engine/Help/HelpSystem.OnlineHelp.Tests.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ Describe 'Get-Help -Online opens the default web browser and navigates to the cm
4949

5050
$skipTest = [System.Management.Automation.Platform]::IsIoT -or
5151
[System.Management.Automation.Platform]::IsNanoServer -or
52-
$env:__InContainer -eq 1
52+
$env:__INCONTAINER -eq 1
5353

5454
# this code is a workaround for issue: https://github.com/PowerShell/PowerShell/issues/3079
5555
if((-not ($skipTest)) -and $IsWindows)

0 commit comments

Comments
 (0)