Fix compilation of pkg/archive tests on non-Linux#2246
Merged
openshift-merge-bot[bot] merged 1 commit intocontainers:mainfrom Feb 4, 2025
Merged
Fix compilation of pkg/archive tests on non-Linux#2246openshift-merge-bot[bot] merged 1 commit intocontainers:mainfrom
openshift-merge-bot[bot] merged 1 commit intocontainers:mainfrom
Conversation
Contributor
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: nalind The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
77768b6 to
0427b27
Compare
Merged
17b2f22 to
d59ef59
Compare
Member
|
LGTM |
d59ef59 to
4af591e
Compare
kolyshkin
reviewed
Feb 4, 2025
pkg/archive/changes_unix_test.go
Outdated
Comment on lines
+1
to
+2
| //go:build !windows | ||
|
|
Contributor
There was a problem hiding this comment.
Strictly speaking,
- it should be
unixrather than!windows(otherwise it won't work on e.g. plan9). - the build tag is redundant as we have
_unix_test.goin the file name (supported since Go 1.19)
Member
Author
There was a problem hiding this comment.
I'll have to remember that. Thanks!
kolyshkin
reviewed
Feb 4, 2025
pkg/archive/changes_unix_test.go
Outdated
| "golang.org/x/sys/unix" | ||
| ) | ||
|
|
||
| // resetSymlinkTimesLinux sets the atime and mtime of a symlink to a known value, to test |
Contributor
There was a problem hiding this comment.
Suggested change
| // resetSymlinkTimesLinux sets the atime and mtime of a symlink to a known value, to test | |
| // resetSymlinkTimes sets the atime and mtime of a symlink to a known value, to test |
Member
Author
There was a problem hiding this comment.
Oof, shoulda caught that. Thanks!
kolyshkin
reviewed
Feb 4, 2025
| // resetSymlinkTimesLinux sets the atime and mtime of a symlink to a known value, to test | ||
| // whether changes to the symlink target are detected correctly. | ||
| func resetSymlinkTimesLinux(path string) error { | ||
| if runtime.GOOS != linux { |
Contributor
There was a problem hiding this comment.
nit: with that, const linux in archive.go (introduced by commit f5c1ad9) is now unused.
Unixy systems all have Lutimes(), and this code should have been stubbed out for non-Unixy systems. h/t @kolyshkin Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
4af591e to
cd5ef3f
Compare
Member
|
/lgtm |
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
3 participants
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.
Unixy systems have Lutimes(), and we should have stubbed it out for non-Unixy systems.