core/cliwrap: Fix is_ostree_layout() in unit tests #5241
Merged
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
The `is_ostree_layout()` function parsed the real root filesystem. But we started using it in *unit tests* which creates unpredictable behavior. The unit test for the core script wrapping was failing for me, and digging in I don't see how it could have ever passed. I don't think we're actually running the Rust tests in CI...need to dig into that. - Change `is_ostree_layout` to take a cap-std root - Add a unit test for it alone - Change all users to pass the rootfs - Fix the `undo()` method to undo the kernel-install wrapping correctly With this the unit test passes again, and we shouldn't have any behavior which depends on the development root. Signed-off-by: Colin Walters <[email protected]>
|
/retest |
|
Quay flakes... |
|
/retest |
This was referenced Jan 23, 2025
Merged
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.
The
is_ostree_layout()function parsed the real root filesystem. But we started using it in unit tests which creates unpredictable behavior.The unit test for the core script wrapping was failing for me, and digging in I don't see how it could have ever passed. I don't think we're actually running the Rust tests in CI...need to dig into that.
is_ostree_layoutto take a cap-std rootundo()method to undo the kernel-install wrapping correctlyWith this the unit test passes again, and we shouldn't have any behavior which depends on the development root.