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

head/tail/split: make error handling of NUM/SIZE arguments more

Browse source 
consistent

* add tests for each flag that takes NUM/SIZE arguments
* fix bug in tail where 'quiet' and 'verbose' flags did not override each other POSIX style
This commit is contained in:
Jan Scheer 2021-06-03 20:37:29 +02:00
parent 5898b99627
commit ad26b7a042
7 changed files with 93 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

25
tests/by-util/test_tail.rs
View file

@ -284,12 +284,11 @@ fn test_multiple_input_files_with_suppressed_headers() {
#[test]
fn test_multiple_input_quiet_flag_overrides_verbose_flag_for_suppressing_headers() {
// TODO: actually the later one should win, i.e. -qv should lead to headers being printed, -vq to them being suppressed
new_ucmd!()
.arg(FOOBAR_TXT)
.arg(FOOBAR_2_TXT)
.arg("-q")
.arg("-v")
.arg("-q")
.run()
.stdout_is_fixture("foobar_multiple_quiet.expected");
}
@ -367,16 +366,26 @@ fn test_tail_invalid_num() {
new_ucmd!()
.args(&["-c", "1Y", "emptyfile.txt"])
.fails()
.stderr_is(
"tail: invalid number of bytes: ‘1Y’: Value too large to be stored in data type",
);
.stderr_is("tail: invalid number of bytes: ‘1Y’: Value too large for defined data type");
#[cfg(not(target_pointer_width = "128"))]
new_ucmd!()
.args(&["-n", "1Y", "emptyfile.txt"])
.fails()
.stderr_is(
"tail: invalid number of lines: ‘1Y’: Value too large to be stored in data type",
);
.stderr_is("tail: invalid number of lines: ‘1Y’: Value too large for defined data type");
#[cfg(target_pointer_width = "32")]
{
let sizes = ["1000G", "10T"];
for size in &sizes {
new_ucmd!()
.args(&["-c", size])
.fails()
.code_is(1)
.stderr_only(format!(
"tail: invalid number of bytes: ‘{}’: Value too large for defined data type",
size
));
}
}
}
#[test]