Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,7 @@ class StreamResource : BaseTestClass
{
Write-Verbose -Verbose "This is a Verbose message"
Write-Debug -Debug "This is a Debug message"
$ErrorActionPreference = "Continue"
Write-Error "This is an Error message"
}

Expand Down
6 changes: 3 additions & 3 deletions adapters/powershell/Tests/powershellgroup.resource.tests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,7 @@ Describe 'PowerShell adapter resource tests' {
It 'Error messages come from Write-Error' {
$null = dsc -l error resource set -r TestClassResource/StreamResource -i '{"Name":"TestClassResource1"}' 2> $TestDrive/error.log
$logContent = Get-Content -Path $TestDrive/error.log -Raw
$LASTEXITCODE | Should -Be 2 -Because $logContent
$LASTEXITCODE | Should -Be 0 -Because $logContent
$logContent | Should -Match 'ERROR .*? This is an Error message' -Because $logContent
}

Expand All @@ -423,14 +423,14 @@ Describe 'PowerShell adapter resource tests' {
It 'Debug messages come from Write-Verbose' {
$null = "{'Name':'TestClassResource1'}" | dsc -l debug resource set -r 'TestClassResource/StreamResource' -f - 2> $TestDrive/debug.log
$logContent = Get-Content -Path $TestDrive/debug.log -Raw
$LASTEXITCODE | Should -Be 2 -Because $logContent
$LASTEXITCODE | Should -Be 0 -Because $logContent
$logContent | Should -Match 'DEBUG .*? This is a Verbose message' -Because $logContent
}

It 'Trace messages come from Write-Debug' {
$null = dsc -l trace resource set -r TestClassResource/StreamResource -i '{"Name":"TestClassResource1"}' 2> $TestDrive/trace.log
$logContent = Get-Content -Path $TestDrive/trace.log -Raw
$LASTEXITCODE | Should -Be 2 -Because $logContent
$LASTEXITCODE | Should -Be 0 -Because $logContent
$logContent | Should -Match 'TRACE .*? This is a Debug message' -Because $logContent
}

Expand Down
2 changes: 1 addition & 1 deletion adapters/powershell/psDscAdapter/powershell.resource.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -430,8 +430,8 @@ try {
$outputCollection = $ps.EndInvoke($asyncResult)
}
catch {
Write-DscTrace -Now -Operation Error -Message $_
Write-TraceQueue
Write-DscTrace -Now -Operation Error -Message $_
exit 1
}

Expand Down
Loading