Test Linux fallback paths without use of cfg()s #628
+69
−22
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
This PR changes our Linux fallback tests to test the "real" fallback paths rather than using various `cfg()`s within the implementation. As these tests require being run sequentally and only work on Linux, they are configured to require manual invocation. Also renames `tests/mod.rs` to `tests/common.rs` to reuse our tests. Actually testing the netbsd fallback is harder, so that's best left for a future PR. Signed-off-by: Joe Richey <[email protected]>
newpavlov
reviewed
Mar 9, 2025
| path.to_str() == Some("/dev/urandom") | ||
| } | ||
| let mut dir = read_dir("/proc/self/fd").expect("/proc/self exists"); | ||
| assert!(dir.any(|path| is_urandom(path.expect("entry exists")))); |
There was a problem hiding this comment.
Why not simply inline the is_urandom function?
let has_open_urandom = read_dir("/proc/self/fd")
.expect("/proc/self exists")
.any(|dir_entry| {
let path = dir_entry.expect("entry exists").path();
let path = path.canonicalize().expect("entry is valid");
path.to_str() == Some("/dev/urandom")
});
assert!(has_open_urandom);| // Override libc::getrandom to simulate failure | ||
| #[export_name = "getrandom"] | ||
| pub unsafe extern "C" fn fake_getrandom(_: *mut c_void, _: size_t, _: c_uint) -> ssize_t { | ||
| FAKE_GETRANDOM_CALLED.store(true, Ordering::SeqCst); |
There was a problem hiding this comment.
I think AcqRel should be sufficient here?
| @@ -53,6 +53,8 @@ jobs: | |||
| targets: ${{ matrix.target }} | |||
| - uses: Swatinem/rust-cache@v2 | |||
| - run: cargo test --target=${{ matrix.target }} --features=std | |||
| - run: cargo test --test linux_no_fallback -- --test-threads 1 | |||
| - run: cargo test --test linux_force_fallback -- --test-threads 1 | |||
There was a problem hiding this comment.
Are you sure that the order of tests is guaranteed?
|
Overall, it's an interesting approach, but I am not sure if it's simpler than the |
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.
This PR changes our Linux fallback tests to test the "real" fallback paths rather than using various
cfg()s within the implementation.As these tests require being run sequentally and only work on Linux, they are configured to require manual invocation.
Also renames
tests/mod.rstotests/common.rsto reuse our tests.Actually testing the netbsd fallback is harder, so that's best left for a future PR.