From d926eabfffe7f8ddafb69599fb9956f814968dfc Mon Sep 17 00:00:00 2001 From: Tyler Leonhardt Date: Fri, 4 Jan 2019 16:17:07 -0800 Subject: [PATCH 1/2] fix test failure on pwsh 6.2-preview.3 --- .../Microsoft.Azure.Functions.PowerShellWorker.Tests.ps1 | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/test/Unit/Modules/Microsoft.Azure.Functions.PowerShellWorker.Tests.ps1 b/test/Unit/Modules/Microsoft.Azure.Functions.PowerShellWorker.Tests.ps1 index 27c0b0c4..96ceeaf9 100644 --- a/test/Unit/Modules/Microsoft.Azure.Functions.PowerShellWorker.Tests.ps1 +++ b/test/Unit/Modules/Microsoft.Azure.Functions.PowerShellWorker.Tests.ps1 @@ -200,8 +200,13 @@ Describe 'Azure Functions PowerShell Langauge Worker Helper Module Tests' { $outStringResults = Write-TestObject | Out-String -Stream $ps.Streams.Information.Count | Should -BeExactly ($outStringResults.Count + 1) - $countWithoutTrailingNewLines = $outStringResults.Count - 2 - for ($i = 0; $i -lt $countWithoutTrailingNewLines; $i++) { + + $lastNonWhitespaceItem = $outStringResults.Count + while ([string]::IsNullOrWhiteSpace($outStringResults[$lastNonWhitespaceItem])) { + $lastNonWhitespaceItem-- + } + + for ($i = 0; $i -le $lastNonWhitespaceItem; $i++) { $ps.Streams.Information[$i].MessageData | Should -BeExactly $outStringResults[$i] $ps.Streams.Information[$i].Tags | Should -BeExactly "__PipelineObject__" } From ea7c299702de64e2923ef7f910c1cb310e221e38 Mon Sep 17 00:00:00 2001 From: Dongbo Wang Date: Fri, 4 Jan 2019 23:30:28 -0800 Subject: [PATCH 2/2] Update test/Unit/Modules/Microsoft.Azure.Functions.PowerShellWorker.Tests.ps1 Co-Authored-By: TylerLeonhardt --- .../Microsoft.Azure.Functions.PowerShellWorker.Tests.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Unit/Modules/Microsoft.Azure.Functions.PowerShellWorker.Tests.ps1 b/test/Unit/Modules/Microsoft.Azure.Functions.PowerShellWorker.Tests.ps1 index 96ceeaf9..9ab92630 100644 --- a/test/Unit/Modules/Microsoft.Azure.Functions.PowerShellWorker.Tests.ps1 +++ b/test/Unit/Modules/Microsoft.Azure.Functions.PowerShellWorker.Tests.ps1 @@ -201,7 +201,7 @@ Describe 'Azure Functions PowerShell Langauge Worker Helper Module Tests' { $outStringResults = Write-TestObject | Out-String -Stream $ps.Streams.Information.Count | Should -BeExactly ($outStringResults.Count + 1) - $lastNonWhitespaceItem = $outStringResults.Count + $lastNonWhitespaceItem = $outStringResults.Count - 1 while ([string]::IsNullOrWhiteSpace($outStringResults[$lastNonWhitespaceItem])) { $lastNonWhitespaceItem-- }