RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-28 03:27:44 +00:00
Code Issues Activity

tests/dd: Do not use the OS provided dd utility on FIFOs

Browse source 
On *BSD and macOS, the system provided dd utility opens up the output
file for both reading and writing. This means that the open/write to the
FIFO does not block, and almost instantly completes. The system dd then
exits, leaving nothing left to be read by the time the coreutils-rs dd
tries to open/read the FIFO.

Avoid this problem by just writing to the FIFO from the test case
itself, rather than relying on the system provide dd.
This commit is contained in:
Nathan Houghton 2023-10-21 20:23:28 -07:00
parent 9d752d59d2
commit db26dabd6e
1 changed files with 22 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

72
tests/by-util/test_dd.rs
View file

@ -15,8 +15,6 @@ use regex::Regex;
use std::fs::{File, OpenOptions}; use std::fs::{File, OpenOptions};
use std::io::{BufReader, Read, Write}; use std::io::{BufReader, Read, Write};
use std::path::PathBuf; use std::path::PathBuf;
#[cfg(all(unix, not(target_os = "macos"), not(target_os = "freebsd")))]
use std::process::{Command, Stdio};
#[cfg(not(windows))] #[cfg(not(windows))]
use std::thread::sleep; use std::thread::sleep;
#[cfg(not(windows))] #[cfg(not(windows))]
@ -1459,74 +1457,48 @@ fn test_sparse() {
assert_eq!(at.metadata("infile").len(), at.metadata("outfile").len()); assert_eq!(at.metadata("infile").len(), at.metadata("outfile").len());
} }
// TODO These FIFO tests should work on macos, but some issue is
// causing our implementation of dd to wait indefinitely when it
// shouldn't.
/// Test that a seek on an output FIFO results in a read. /// Test that a seek on an output FIFO results in a read.
#[test] #[test]
#[cfg(all(unix, not(target_os = "macos"), not(target_os = "freebsd")))] #[cfg(unix)]
fn test_seek_output_fifo() { fn test_seek_output_fifo() {
let ts = TestScenario::new(util_name!()); let ts = TestScenario::new(util_name!());
let at = &ts.fixtures; let at = &ts.fixtures;
at.mkfifo("fifo"); at.mkfifo("fifo");
// TODO When `dd` is a bit more advanced, we could use the uutils let mut ucmd = ts.ucmd();
// version of dd here as well. let child = ucmd
let child = Command::new("dd")
.current_dir(&at.subdir)
.args([
"count=1",
"if=/dev/zero",
&format!("of={}", at.plus_as_string("fifo")),
"status=noxfer",
])
.stderr(Stdio::piped())
.spawn()
.expect("failed to execute child process");
ts.ucmd()
.args(&["count=0", "seek=1", "of=fifo", "status=noxfer"]) .args(&["count=0", "seek=1", "of=fifo", "status=noxfer"])
.succeeds() .run_no_wait();
.stderr_only("0+0 records in\n0+0 records out\n");
let output = child.wait_with_output().unwrap(); std::fs::write(at.plus("fifo"), &vec![0; 512]).unwrap();
assert!(output.status.success());
assert!(output.stdout.is_empty()); child
assert_eq!(&output.stderr, b"1+0 records in\n1+0 records out\n"); .wait()
.unwrap()
.success()
.stderr_only("0+0 records in\n0+0 records out\n");
} }
/// Test that a skip on an input FIFO results in a read. /// Test that a skip on an input FIFO results in a read.
#[test] #[test]
#[cfg(all(unix, not(target_os = "macos"), not(target_os = "freebsd")))] #[cfg(unix)]
fn test_skip_input_fifo() { fn test_skip_input_fifo() {
let ts = TestScenario::new(util_name!()); let ts = TestScenario::new(util_name!());
let at = &ts.fixtures; let at = &ts.fixtures;
at.mkfifo("fifo"); at.mkfifo("fifo");
// TODO When `dd` is a bit more advanced, we could use the uutils let mut ucmd = ts.ucmd();
// version of dd here as well. let child = ucmd
let child = Command::new("dd")
.current_dir(&at.subdir)
.args([
"count=1",
"if=/dev/zero",
&format!("of={}", at.plus_as_string("fifo")),
"status=noxfer",
])
.stderr(Stdio::piped())
.spawn()
.expect("failed to execute child process");
ts.ucmd()
.args(&["count=0", "skip=1", "if=fifo", "status=noxfer"]) .args(&["count=0", "skip=1", "if=fifo", "status=noxfer"])
.succeeds() .run_no_wait();
.stderr_only("0+0 records in\n0+0 records out\n");
let output = child.wait_with_output().unwrap(); std::fs::write(at.plus("fifo"), &vec![0; 512]).unwrap();
assert!(output.status.success());
assert!(output.stdout.is_empty()); child
assert_eq!(&output.stderr, b"1+0 records in\n1+0 records out\n"); .wait()
.unwrap()
.success()
.stderr_only("0+0 records in\n0+0 records out\n");
} }
/// Test for reading part of stdin from each of two child processes. /// Test for reading part of stdin from each of two child processes.