Repository navigation
Keep the runtime's detector out of the snapshot check's no-detector test - #570
Merged
Merged
Conversation
The case for a root without omarchy-hw-platform only left the fake detector off PATH. With the runtime's bin/ on PATH, as when the suites run with OMARCHY_PATH/bin first, the real detector answered for the host, the hook took it for another platform and let the restore through. The case now drops every PATH entry that provides a detector.
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.
Fixes the
snapshot-check-test.shfailure reported as flaky after #560. It isn't timing: the test depends on PATH, and it fails every time the runtime'sbin/comes first on PATH.Cause
The case "a restore from the running system of a root without the platform detector" (added in #560) only removed the fake
omarchy-hw-platformfrom PATH. When the suite runs with$OMARCHY_PATH/binfirst on PATH, as CI's runtime step and the #563 run did, the hook still finds the real detector. The real detector answers for the host (generic or generic-aarch64). The hook takes that as "not a Mac" and lets the restore through (status 0).The failing #563 run exported
PATH=$OMARCHY_PATH/bin:$PATH; the runs that passed didn't. CI's boot-suite step runs without it, which is why CI stayed green.Fix
In that case, the test drops every PATH entry that provides
omarchy-hw-platform. The hook is unchanged: it behaves correctly on a real root without the detector.Testing
Run in a CI replica on the x86 test host: the
archlinux:base-develimage pinned intests.yml, CI's packages, and a non-roottesteruser.bin/on PATH: the boot suite fails 2 of 2 runs on exactly the reported assertion.bin/on PATH and 12 of 12 without (195 ok each).bin/on PATH: 20 of 20 full boot-suite runs pass under parallel load. No timing dependence showed up.bin/on PATH before the fix and passes after.