Skip to content

Fix ConciseView to show Activity instead of myCommand #11007

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
iSazonov merged 6 commits into from
Nov 10, 2019
Merged

Fix ConciseView to show Activity instead of myCommand #11007

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c61ee44
Fix to show Activity instead of myCommand
SteveL-MSFT Nov 7, 2019
66c3dda
update write-error test
SteveL-MSFT Nov 7, 2019
ba0df86
make validation less strict for CI
SteveL-MSFT Nov 7, 2019
7132076
update errorview test
SteveL-MSFT Nov 7, 2019
f96cae3
handle script function case
SteveL-MSFT Nov 7, 2019
3e52906
address Jim's offline feedback
SteveL-MSFT Nov 7, 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
9 changes: 9 additions & 0 deletions ...m.Management.Automation/FormatAndOutput/DefaultFormatters/PowerShellCore_format_ps1xml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1104,6 +1104,15 @@ function Get-ConciseViewPositionMessage {
if ($_.Exception -and $_.Exception.WasThrownFromThrowStatement) {
$reason = 'Exception'
}
# MyCommand can be the script block, so we don't want to show that so check if it's an actual command
elseif ($myinv.MyCommand -and (Get-Command -Name $myinv.MyCommand -ErrorAction Ignore))
{
$reason = $myinv.MyCommand
}
# If it's a scriptblock, better to show the command in the scriptblock that had the error
elseif ($_.CategoryInfo.Activity) {
$reason = $_.CategoryInfo.Activity
}
elseif ($myinv.MyCommand) {
$reason = $myinv.MyCommand
}
Expand Down
2 changes: 1 addition & 1 deletion test/powershell/Modules/Microsoft.PowerShell.Utility/Write-Stream.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Describe "Stream writer tests" -Tags "CI" {
It "Should write error messages to the error stream" {
Write-Error "Testing Error" 2>&1 > $targetfile
# The contents of the error stream should contain the expected text
$targetfile | Should -FileContentMatch ": Testing Error"
$targetfile | Should -FileContentMatch "Testing Error"
}

It "Should write debug messages to the debug stream" {
Expand Down
12 changes: 12 additions & 0 deletions test/powershell/engine/Formatting/ErrorView.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,17 @@ Describe 'Tests for $ErrorView' -Tag CI {
Start-Job -ScriptBlock { get-item (new-guid) } | Wait-Job | Receive-Job -ErrorVariable e -ErrorAction SilentlyContinue
($e | Out-String).Trim().Count | Should -Be 1
}

It "Activity shows up correctly for scriptblocks" {
$e = pwsh -noprofile -command 'Write-Error 'myError' -ErrorAction SilentlyContinue; $error[0] | Out-String'
[string]::Join('', $e).Trim() | Should -BeLike "*Write-Error:*myError*" # wildcard due to VT100
}

It "Function shows up correctly" {
function test-myerror { [cmdletbinding()] param() write-error 'myError' }

$e = pwsh -noprofile -command 'function test-myerror { [cmdletbinding()] param() write-error "myError" }; test-myerror -ErrorAction SilentlyContinue; $error[0] | Out-String'
[string]::Join('', $e).Trim() | Should -BeLike "*test-myerror:*myError*" # wildcard due to VT100
}
}
}