fix(tests): canonicalize hook CWD paths - #674
Closed
carlospedreira wants to merge 1 commit into
Closed
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
This PR updates the hook/CWD assertions in tests/Test-Hooks.ps1 to compare canonicalized filesystem locations rather than raw path strings, avoiding platform-specific alias mismatches (notably macOS /var vs /private/var and Windows short/long path forms).
Changes:
- Added
Resolve-Issue628CanonicalPathto canonicalize paths viaResolve-Path, WindowsGetLongPathName, and POSIXpwd -P. - Updated
Assert-VerifyCwdMarkerto compare canonical expected/actual CWD values and to enforce “all five markers resolve to one directory” using canonicalized values.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
+454
to
+472
| if ($IsWindows) { | ||
| if (-not ('DotbotTestNativePath' -as [type])) { | ||
| Add-Type -TypeDefinition @' | ||
| using System; | ||
| using System.Runtime.InteropServices; | ||
| using System.Text; | ||
|
|
||
| public static class DotbotTestNativePath | ||
| { | ||
| [DllImport("kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)] | ||
| public static extern uint GetLongPathName(string shortPath, StringBuilder longPath, uint bufferLength); | ||
| } | ||
| '@ | ||
| } | ||
| $buffer = [System.Text.StringBuilder]::new(32768) | ||
| $length = [DotbotTestNativePath]::GetLongPathName($resolved, $buffer, [uint32]$buffer.Capacity) | ||
| if ($length -gt 0 -and $length -lt $buffer.Capacity) { | ||
| $resolved = $buffer.ToString() | ||
| } |
Comment on lines
+499
to
+503
| $canonicalLines = @($lines | ForEach-Object { Resolve-Issue628CanonicalPath -Path ([string]$_).Trim() }) | ||
| Assert-Equal -Name "$Name`: verify chain cwd" -Expected $canonicalExpected -Actual ($canonicalLines | Select-Object -First 1) ` | ||
| -Message "Expected every stub to run in '$ExpectedDir' ('$canonicalExpected' canonical), got: $($lines -join ', ')" | ||
| Assert-True -Name "$Name`: cwd consistent across the whole chain" ` | ||
| -Condition (@($lines | Select-Object -Unique).Count -eq 1) | ||
| -Condition (@($canonicalLines | Select-Object -Unique).Count -eq 1) |
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.
Closes #672
Canonicalizes verify-hook working-directory comparisons before asserting equality.
Validation: