Skip to content

Fix flaky test. #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
qwandor wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix flaky test. #24

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e572c0
Fix flaky test.
qwandor Nov 30, 2023
a5ae0bd
Don't close the directory while we're still reading it.
qwandor Nov 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ mod tests {
let file = File::open("testdata/file1.txt").unwrap();
let file_fd: OwnedFd = file.into();
let raw_file_fd = file_fd.as_raw_fd();
assert!(raw_file_fd > 3);
assert!(raw_file_fd > 2);
command.preserved_fds(vec![file_fd]);

let output = command.output().unwrap();
Expand Down Expand Up @@ -416,11 +416,16 @@ mod tests {
/// This is necessary because GitHub Actions opens a bunch of others for some reason.
fn close_excess_fds() {
let dir = read_dir("/proc/self/fd").unwrap();
for entry in dir {
let entry = entry.unwrap();
let fd: RawFd = entry.file_name().to_str().unwrap().parse().unwrap();
if fd > 3 {
close(fd).unwrap();
let fds: Vec<RawFd> = dir
.map(|entry| {
let entry = entry.unwrap();
entry.file_name().to_str().unwrap().parse().unwrap()
})
.collect();
for fd in fds {
if fd > 2 {
// Ignore errors, as the file may already be closed.
let _ = close(fd);
}
}
}
Expand Down