Mirrors/coreutils
2
0
Fork 0
mirror of https://github.com/uutils/coreutils synced 2025-01-21 01:24:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3910 from Joining7943/3895-fix-broken-pipe-error-in-utils

Browse source 
fix broken pipe error in tests/common/util
This commit is contained in:
Sylvestre Ledru 2022-09-12 22:42:36 +02:00 committed by GitHub
commit b44cf9cde9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
tests/common/util.rs
View file

@ -17,7 +17,7 @@ use std::env;
use std::ffi::CString; use std::ffi::CString;
use std::ffi::OsStr; use std::ffi::OsStr;
use std::fs::{self, hard_link, File, OpenOptions}; use std::fs::{self, hard_link, File, OpenOptions};
use std::io::{Read, Result, Write}; use std::io::{BufWriter, Read, Result, Write};
#[cfg(unix)] #[cfg(unix)]
use std::os::unix::fs::{symlink as symlink_dir, symlink as symlink_file}; use std::os::unix::fs::{symlink as symlink_dir, symlink as symlink_file};
#[cfg(windows)] #[cfg(windows)]
@ -1105,13 +1105,14 @@ impl UCommand {
} }
if let Some(ref input) = self.bytes_into_stdin { if let Some(ref input) = self.bytes_into_stdin {
let write_result = child let child_stdin = child
.stdin .stdin
.take() .take()
.unwrap_or_else(|| panic!("Could not take child process stdin")) .unwrap_or_else(|| panic!("Could not take child process stdin"));
.write_all(input); let mut writer = BufWriter::new(child_stdin);
let result = writer.write_all(input);
if !self.ignore_stdin_write_error { if !self.ignore_stdin_write_error {
if let Err(e) = write_result { if let Err(e) = result {
panic!("failed to write to stdin of child: {}", e); panic!("failed to write to stdin of child: {}", e);
} }
} }
@ -1828,4 +1829,22 @@ mod tests {
println!("TEST SKIPPED (cannot run inside CI)"); println!("TEST SKIPPED (cannot run inside CI)");
} }
} }
// This error was first detected when running tail so tail is used here but
// should fail with any command that takes piped input.
// See also https://github.com/uutils/coreutils/issues/3895
#[test]
fn test_when_piped_input_then_no_broken_pipe() {
let ts = TestScenario::new("tail");
for i in 0..10000 {
dbg!(i);
let test_string = "a\nb\n";
ts.ucmd()
.args(&["-n", "0"])
.pipe_in(test_string)
.succeeds()
.no_stdout()
.no_stderr();
}
}
} }