From 961c6a65d7f54871bd9ba9164368c35a14f467b0 Mon Sep 17 00:00:00 2001 From: "Steve Lee (POWERSHELL HE/HIM) (from Dev Box)" Date: Sat, 17 Oct 2026 19:38:22 -0700 Subject: [PATCH 1/2] Fix debug trace test --- .../Tests/TestClassResource/0.0.1/TestClassResource.psm1 | 1 + adapters/powershell/psDscAdapter/powershell.resource.ps1 | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/adapters/powershell/Tests/TestClassResource/0.0.1/TestClassResource.psm1 b/adapters/powershell/Tests/TestClassResource/0.0.1/TestClassResource.psm1 index a6ea35030..4ee67740c 100644 --- a/adapters/powershell/Tests/TestClassResource/0.0.1/TestClassResource.psm1 +++ b/adapters/powershell/Tests/TestClassResource/0.0.1/TestClassResource.psm1 @@ -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" } diff --git a/adapters/powershell/psDscAdapter/powershell.resource.ps1 b/adapters/powershell/psDscAdapter/powershell.resource.ps1 index 46f0794da..7d4086a2a 100644 --- a/adapters/powershell/psDscAdapter/powershell.resource.ps1 +++ b/adapters/powershell/psDscAdapter/powershell.resource.ps1 @@ -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 } From ee5d80445965171b2ba4a409467acef9a6834c74 Mon Sep 17 00:00:00 2001 From: "Steve Lee (POWERSHELL HE/HIM) (from Dev Box)" Date: Sat, 17 Oct 2026 20:20:12 -0700 Subject: [PATCH 2/2] fix test since write-error is now non-terminating --- .../powershell/Tests/powershellgroup.resource.tests.ps1 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/adapters/powershell/Tests/powershellgroup.resource.tests.ps1 b/adapters/powershell/Tests/powershellgroup.resource.tests.ps1 index 6dfbe5b95..865b74f0a 100644 --- a/adapters/powershell/Tests/powershellgroup.resource.tests.ps1 +++ b/adapters/powershell/Tests/powershellgroup.resource.tests.ps1 @@ -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 } @@ -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 }