Skip to content

Fix command runtime so StopUpstreamCommandsException doesn't get populated in -ErrorVariable #10840

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
anmenaga merged 2 commits into from
Oct 22, 2019
Merged

Fix command runtime so StopUpstreamCommandsException doesn't get populated in -ErrorVariable #10840

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e15133d
BUG: Fix command runtime so StopUpstreamCommandsException doesn't get…
SteveL-MSFT Oct 18, 2019
8de01b8
Update test/powershell/Modules/Microsoft.PowerShell.Utility/Select-Ob…
SteveL-MSFT Oct 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/System.Management.Automation/engine/MshCommandRuntime.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2381,7 +2381,8 @@ public Exception ManageException(Exception e)
// 913088-2005/06/06
// PipelineStoppedException should not get added to $Error
// 2008/06/25 - narrieta: ExistNestedPromptException should not be added to $error either
if (!(e is HaltCommandException) && !(e is PipelineStoppedException) && !(e is ExitNestedPromptException))
// 2019/10/18 - StopUpstreamCommandsException should not be added either
if (!(e is HaltCommandException) && !(e is PipelineStoppedException) && !(e is ExitNestedPromptException) && !(e is StopUpstreamCommandsException))
{
try
{
Expand Down
7 changes: 6 additions & 1 deletion test/powershell/Modules/Microsoft.PowerShell.Utility/Select-Object.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,12 @@ Describe "Select-Object" -Tags "CI" {
$result[0].Size | Should -Be ($orig1 + 1)
$dirObject[0].Size | Should -Be ($orig1 + 1)
$dirObject[$TestLength].Size | Should -Be ($orig2 + 1)
}
}

It "Should not leak 'StopUpstreamCommandsException' internal exception for stopping upstream" {
1,2 | Select-Object -First 1 -ErrorVariable err
$err | Should -BeNullOrEmpty
}
}

Describe "Select-Object DRT basic functionality" -Tags "CI" {
Expand Down