bake: fix entitlement test when running from symlink temp #2815
Conversation
This file contains 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
As the paths returned by validator have the symlinks resolved, the test needs to resolve the symlinks also in the expected values. Previously this would fail if t.TempDir() or os.GetWd() returned a path that contained a symlink. The issue was purely in the test and not in the entitlements validation logic. Signed-off-by: Tonis Tiigi <[email protected]>
crazy-max
reviewed
Nov 25, 2024
| @@ -180,10 +180,18 @@ func TestValidateEntitlements(t *testing.T) { | |||
| dir2, err := osutil.GetLongPathName(t.TempDir()) | |||
| require.NoError(t, err) | |||
|
|
|||
| // the paths returned by entitlements validation will have symlinks resolved | |||
| expDir1, err := filepath.EvalSymlinks(dir1) | |||
There was a problem hiding this comment.
In this case I think we can remove osutil.GetLongPathName for dir1 related to #2812 (comment)
bake/entitlements_test.go
Outdated
| require.NoError(t, err) | ||
| expDir2, err := filepath.EvalSymlinks(dir2) | ||
| require.NoError(t, err) | ||
|
|
||
| escapeLink := filepath.Join(dir1, "escape_link") | ||
| require.NoError(t, os.Symlink("../../aa", escapeLink)) | ||
|
|
||
| wd := osutil.GetWd() |
There was a problem hiding this comment.
Same here, we can get back to os.Getwd()
Signed-off-by: Tonis Tiigi <[email protected]>
crazy-max
approved these changes
Nov 25, 2024
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.
As the paths returned by validator have the symlinks resolved, the test needs to resolve the symlinks also in the expected values. Previously this would fail if t.TempDir() or os.GetWd() returned a path that contained a symlink.
The issue was purely in the test and not in the entitlements validation logic.