Fix the DSC test by skipping AfterAll cleanup if the initial setup in BeforeAll failed#26621
Merged
daxian-dbw merged 2 commits intoPowerShell:masterfrom Dec 16, 2025
Merged
Fix the DSC test by skipping AfterAll cleanup if the initial setup in BeforeAll failed#26621daxian-dbw merged 2 commits intoPowerShell:masterfrom
AfterAll cleanup if the initial setup in BeforeAll failed#26621daxian-dbw merged 2 commits intoPowerShell:masterfrom
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
This PR fixes a critical bug in the DSC profile resource test file where the AfterAll cleanup block was attempting to restore $env:PATH to $originalPath even when the BeforeAll setup had failed and $originalPath was never initialized. This would effectively delete the PATH environment variable from the test process when DSC_ROOT was not set.
Key Changes:
- Introduced a
$skipCleanupflag to track whetherBeforeAllsetup completed successfully - Moved
$originalPathinitialization to occur before any potential exceptions in the second Describe block - Added early return in both
AfterAllblocks when cleanup should be skipped
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
jshigetomi
approved these changes
Dec 16, 2025
9 tasks
pwshBot
pushed a commit
to pwshBot/PowerShell
that referenced
this pull request
Dec 16, 2025
…in `BeforeAll` failed (PowerShell#26621)
kilasuit
pushed a commit
to kilasuit/PowerShell
that referenced
this pull request
Jan 2, 2026
…in `BeforeAll` failed (PowerShell#26621)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
PR Summary
The test
dsc.profileresource.Tests.ps1blindly restores$env:PATHto$originalPath, butBeforeAllthrows whenDSC_ROOTis not set and in that case the$originalPathis not set yet. So,$env:PATH = $originalPathinAftgerAllbasically removes the PATH env variable from the current process.