maxmustermann/PowerShell
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Ensure Wait-UntilTrue returns $true in Pester tests (#9458)

Browse source
This commit is contained in:
xtqqczze 2019-05-02 01:03:43 +01:00 committed by Aditya Patwardhan
parent aeb601892d
commit a702f68974
10 changed files with 19 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
test/powershell/Language/Scripting/NativeExecution/NativeCommandProcessor.Tests.ps1
View file

@ -207,13 +207,12 @@ Categories=Application;
# Validate on Linux by reassociating default app for text file
& $TestFile
# It may take time for handler to start
Wait-FileToBePresent -File "$HOME/nativeCommandProcessor.Success" -TimeoutInSeconds 10 -IntervalInMilliseconds 100
Wait-FileToBePresent -File "$HOME/nativeCommandProcessor.Success" -TimeoutInSeconds 10 -IntervalInMilliseconds 100 | Should -BeTrue
Get-Content $HOME/nativeCommandProcessor.Success | Should -BeExactly $TestFile
}
else {
& $TestFile
Wait-FileToBePresent -File $TestDrive\foo.txt -TimeoutInSeconds 10 -IntervalInMilliseconds 100
"$TestDrive\foo.txt" | Should -Exist
Wait-FileToBePresent -File $TestDrive\foo.txt -TimeoutInSeconds 10 -IntervalInMilliseconds 100 | Should -BeTrue
Get-Content $TestDrive\foo.txt | Should -BeExactly $TestFile
}
}

8
test/powershell/Modules/Microsoft.PowerShell.Core/Enter-PSHostProcess.Tests.ps1
View file

@ -85,7 +85,7 @@ Describe "Enter-PSHostProcess tests" -Tag Feature {
}
It "Can enter, exit, and re-enter another PSHost" {
Wait-UntilTrue { [bool](Get-PSHostProcessInfo -Id $pwshId) }
Wait-UntilTrue { [bool](Get-PSHostProcessInfo -Id $pwshId) } | Should -BeTrue
# This will enter and exit another process
Invoke-PSHostProcessScript -ArgumentString "-Id $pwshId" -Id $pwshId |
@ -109,7 +109,7 @@ Describe "Enter-PSHostProcess tests" -Tag Feature {
$powershellId = Wait-JobPid $powershellJob
try {
Wait-UntilTrue { [bool](Get-PSHostProcessInfo -Id $powershellId) }
Wait-UntilTrue { [bool](Get-PSHostProcessInfo -Id $powershellId) } | Should -BeTrue
# This will enter and exit another process
Invoke-PSHostProcessScript -ArgumentString "-Id $powershellId" -Id $powershellId |
@ -126,7 +126,7 @@ Describe "Enter-PSHostProcess tests" -Tag Feature {
It "Can enter using NamedPipeConnectionInfo" {
try {
Wait-UntilTrue { [bool](Get-PSHostProcessInfo -Id $pwshId) }
Wait-UntilTrue { [bool](Get-PSHostProcessInfo -Id $pwshId) } | Should -BeTrue
$npInfo = [System.Management.Automation.Runspaces.NamedPipeConnectionInfo]::new($pwshId)
$rs = [runspacefactory]::CreateRunspace($npInfo)
@ -159,7 +159,7 @@ Describe "Enter-PSHostProcess tests" -Tag Feature {
$pwshId = Wait-JobPid $pwshJob
try {
Wait-UntilTrue { Test-Path $pipePath }
Wait-UntilTrue { Test-Path $pipePath } | Should -BeTrue
# This will enter and exit another process
Invoke-PSHostProcessScript -ArgumentString "-CustomPipeName $pipeName" -Id $pwshId |

4
test/powershell/Modules/Microsoft.PowerShell.Core/Get-PSHostProcessInfo.Tests.ps1
View file

@ -33,7 +33,7 @@ Describe "Get-PSHostProcessInfo tests" -Tag CI {
# Creation of the named pipe is async
Wait-UntilTrue {
Get-PSHostProcessInfo | Where-Object { $_.ProcessId -eq $pwsh.Id }
}
} | Should -BeTrue
$pshosts = Get-PSHostProcessInfo
$pshosts.Count | Should -BeGreaterOrEqual 1
$pshosts.ProcessId | Should -Contain $pwsh.Id
@ -43,7 +43,7 @@ Describe "Get-PSHostProcessInfo tests" -Tag CI {
# Creation of the named pipe is async
Wait-UntilTrue {
Get-PSHostProcessInfo | Where-Object { $_.ProcessId -eq $powershell.Id }
}
} | Should -BeTrue
$psProcess = Get-PSHostProcessInfo | Where-Object { $_.ProcessName -eq "powershell" }
$psProcess.Count | Should -BeGreaterOrEqual 1
$psProcess.ProcessId | Should -Contain $powershell.id

2
test/powershell/Modules/Microsoft.PowerShell.Management/FileSystem.Tests.ps1
View file

@ -1391,7 +1391,7 @@ Describe "Remove-Item UnAuthorized Access" -Tags "CI", "RequireAdminOnWindows" {
Set-Acl $protectedPath $acl
runas.exe /trustlevel:0x20000 "$cmdline"
Wait-FileToBePresent -File $errorFile -TimeoutInSeconds 10
Wait-FileToBePresent -File $errorFile -TimeoutInSeconds 10 | Should -BeTrue
Get-Content $errorFile | Should -BeExactly 'RemoveItemUnauthorizedAccessError,Microsoft.PowerShell.Commands.RemoveItemCommand'
}
}

6
test/powershell/Modules/Microsoft.PowerShell.Management/Start-Process.Tests.ps1
View file

@ -133,7 +133,7 @@ Describe "Start-Process" -Tag "Feature","RequireAdminOnWindows" {
$process.Length | Should -Be 1
$process.Id | Should -BeGreaterThan 1
}
It "Should run without errors when -ArgumentList is @()" {
$process = Start-Process $pingCommand -ArgumentList @() -PassThru @extraArgs
$process.Length | Should -Be 1
@ -165,9 +165,7 @@ Describe "Start-Process tests requiring admin" -Tags "Feature","RequireAdminOnWi
New-Item $fooFile -ItemType File -Force
Start-Process $fooFile
Wait-FileToBePresent -File "$testdrive\foo.txt" -TimeoutInSeconds 10 -IntervalInMilliseconds 100
"$testdrive\foo.txt" | Should -Exist
Wait-FileToBePresent -File "$testdrive\foo.txt" -TimeoutInSeconds 10 -IntervalInMilliseconds 100 | Should -BeTrue
Get-Content $testdrive\foo.txt | Should -BeExactly $fooFile
}
}

4
test/powershell/Modules/Microsoft.PowerShell.Utility/ConvertTo-Json.Tests.ps1
View file

@ -21,7 +21,7 @@ Describe 'ConvertTo-Json' -tags "CI" {
$jsonFormat | Should -Match '"TestValue3": 99999'
}
It "StopProcessing should succeed" {
It "StopProcessing should succeed" -Pending:$true {
$ps = [PowerShell]::Create()
$null = $ps.AddScript({
$obj = [PSCustomObject]@{P1 = ''; P2 = ''; P3 = ''; P4 = ''; P5 = ''; P6 = ''}
@ -32,7 +32,7 @@ Describe 'ConvertTo-Json' -tags "CI" {
})
$null = $ps.BeginInvoke()
# wait for verbose message from ConvertTo-Json to ensure cmdlet is processing
Wait-UntilTrue { $ps.Streams.Verbose.Count -gt 0 }
Wait-UntilTrue { $ps.Streams.Verbose.Count -gt 0 } | Should -BeTrue
$null = $ps.BeginStop($null, $null)
# wait a bit to ensure state has changed, not using synchronous Stop() to avoid blocking Pester
Start-Sleep -Milliseconds 100

4
test/powershell/Modules/Microsoft.PowerShell.Utility/Invoke-Item.Tests.ps1
View file

@ -220,7 +220,7 @@ Categories=Application;
$before = $windows.Count
Invoke-Item -Path ~
# may take time for explorer to open window
Wait-UntilTrue -sb { $windows.Count -gt $before } -TimeoutInMilliseconds (10*1000) -IntervalInMilliseconds 100 > $null
Wait-UntilTrue -sb { $windows.Count -gt $before } -TimeoutInMilliseconds (10*1000) -IntervalInMilliseconds 100 | Should -BeTrue
$after = $windows.Count
$before + 1 | Should -Be $after
@ -234,7 +234,7 @@ Categories=Application;
# validate on Unix by reassociating default app for directories
Invoke-Item -Path $PSHOME
# may take time for handler to start
Wait-FileToBePresent -File "$HOME/InvokeItemTest.Success" -TimeoutInSeconds 10 -IntervalInMilliseconds 100
Wait-FileToBePresent -File "$HOME/InvokeItemTest.Success" -TimeoutInSeconds 10 -IntervalInMilliseconds 100 | Should -BeTrue
Get-Content $HOME/InvokeItemTest.Success | Should -Be $PSHOME
}
else

2
test/powershell/engine/Api/BasicEngine.Tests.ps1
View file

@ -49,7 +49,7 @@ write-host should_not_stop_responding_at_exit
exit
'@
$process = Start-Process pwsh -ArgumentList $command -PassThru
Wait-UntilTrue -sb { $process.HasExited } -TimeoutInMilliseconds 5000 -IntervalInMilliseconds 1000 > $null
Wait-UntilTrue -sb { $process.HasExited } -TimeoutInMilliseconds 5000 -IntervalInMilliseconds 1000 | Should -BeTrue
$expect = "powershell process exits in 5 seconds"
if (-not $process.HasExited) {

2
test/powershell/engine/Api/TaskBasedAsyncPowerShellAPI.Tests.ps1
View file

@ -206,7 +206,7 @@ try {
$ps = [powershell]::Create()
try {
$ir = $ps.AddScript("Start-Sleep -Seconds 60").InvokeAsync()
Wait-UntilTrue { $ps.InvocationStateInfo.State -eq [System.Management.Automation.PSInvocationState]::Running }
Wait-UntilTrue { $ps.InvocationStateInfo.State -eq [System.Management.Automation.PSInvocationState]::Running } | Should -BeTrue
$sr = $ps.StopAsync($null, $null)
[System.Threading.Tasks.Task]::WaitAll(@($sr))
$sr.IsCompletedSuccessfully | Should -Be $true

4
test/tools/Modules/HelpersCommon/HelpersCommon.psm1
View file

@ -18,7 +18,7 @@ function Wait-UntilTrue
return $false
}
# Wait
Start-Sleep -Milliseconds $intervalInMilliseconds
Start-Sleep -Milliseconds $intervalInMilliseconds > $null
}
return $true
}
@ -32,7 +32,7 @@ function Wait-FileToBePresent
[int]$IntervalInMilliseconds = 100
)
Wait-UntilTrue -sb { Test-Path $File } -TimeoutInMilliseconds ($TimeoutInSeconds*1000) -IntervalInMilliseconds $IntervalInMilliseconds > $null
return Wait-UntilTrue -sb { Test-Path $File } -TimeoutInMilliseconds ($TimeoutInSeconds*1000) -IntervalInMilliseconds $IntervalInMilliseconds
}
function Test-IsElevated