mirror of
https://github.com/RGBCube/uutils-coreutils
synced 2025-07-28 03:27:44 +00:00
Use the new function fails_with_code
Done with ``` $ perl -0777 -i -pe 's/([ \t]+)\.fails\(\)[ \t]*\n[ \t]+\.no_stdout\(\)[ \t]*\n[ \t]+\.code_is\(([0-9]+)\);/\1.fails_with_code(\2)\n\1.no_stdout();/gs' *rs $ sed -i -e "s|.fails()(.*).code_is(|.fails_with_code(|g" *rs $ perl -0777 -i -pe 's/([ \t]+)\.fails\(\)[ \t]*\n[ \t]+\.code_is\(([0-9]+)\);/\1.fails_with_code(\2);/gs' *rs $ perl -0777 -i -pe 's/([ \t]+)\.fails\(\)(.*?)[ \t]+\.code_is\(([0-9]+)\);/\1.fails_with_code(\3)\2;/gs' *rs ... ```
This commit is contained in:
Sylvestre Ledru
parent
76ad6042b5
commit
18cb7dcf9e
90 changed files with 448 additions and 732 deletions
|
|
@ -8,7 +8,7 @@ use crate::common::util::TestScenario;
|
|||
|
||||
#[test]
|
||||
fn test_invalid_arg() {
|
||||
new_ucmd!().arg("--definitely-invalid").fails().code_is(1);
|
||||
new_ucmd!().arg("--definitely-invalid").fails_with_code(1);
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
|
@ -58,8 +58,7 @@ fn test_from_iec_i() {
|
|||
fn test_from_iec_i_requires_suffix() {
|
||||
new_ucmd!()
|
||||
.args(&["--from=iec-i", "10M"])
|
||||
.fails()
|
||||
.code_is(2)
|
||||
.fails_with_code(2)
|
||||
.stderr_is("numfmt: missing 'i' suffix in input: '10M' (e.g Ki/Mi/Gi)\n");
|
||||
}
|
||||
|
||||
|
|
@ -257,8 +256,7 @@ fn test_suffixes() {
|
|||
} else {
|
||||
new_ucmd!()
|
||||
.args(&args)
|
||||
.fails()
|
||||
.code_is(2)
|
||||
.fails_with_code(2)
|
||||
.stderr_only(format!("numfmt: invalid suffix in input: '1{c}'\n"));
|
||||
}
|
||||
}
|
||||
|
|
@ -683,7 +681,7 @@ fn test_suffix_with_padding() {
|
|||
|
||||
#[test]
|
||||
fn test_invalid_stdin_number_returns_status_2() {
|
||||
new_ucmd!().pipe_in("hello").fails().code_is(2);
|
||||
new_ucmd!().pipe_in("hello").fails_with_code(2);
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
|
@ -691,9 +689,8 @@ fn test_invalid_stdin_number_in_middle_of_input() {
|
|||
new_ucmd!()
|
||||
.pipe_in("100\nhello\n200")
|
||||
.ignore_stdin_write_error()
|
||||
.fails()
|
||||
.stdout_is("100\n")
|
||||
.code_is(2);
|
||||
.fails_with_code(2)
|
||||
.stdout_is("100\n");
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
|
@ -720,8 +717,7 @@ fn test_invalid_stdin_number_with_abort_returns_status_2() {
|
|||
new_ucmd!()
|
||||
.args(&["--invalid=abort"])
|
||||
.pipe_in("4Q")
|
||||
.fails()
|
||||
.code_is(2)
|
||||
.fails_with_code(2)
|
||||
.stderr_only("numfmt: invalid suffix in input: '4Q'\n");
|
||||
}
|
||||
|
||||
|
|
@ -730,8 +726,7 @@ fn test_invalid_stdin_number_with_fail_returns_status_2() {
|
|||
new_ucmd!()
|
||||
.args(&["--invalid=fail"])
|
||||
.pipe_in("4Q")
|
||||
.fails()
|
||||
.code_is(2)
|
||||
.fails_with_code(2)
|
||||
.stdout_is("4Q\n")
|
||||
.stderr_is("numfmt: invalid suffix in input: '4Q'\n");
|
||||
}
|
||||
|
|
@ -757,8 +752,7 @@ fn test_invalid_arg_number_with_ignore_returns_status_0() {
|
|||
fn test_invalid_arg_number_with_abort_returns_status_2() {
|
||||
new_ucmd!()
|
||||
.args(&["--invalid=abort", "4Q"])
|
||||
.fails()
|
||||
.code_is(2)
|
||||
.fails_with_code(2)
|
||||
.stderr_only("numfmt: invalid suffix in input: '4Q'\n");
|
||||
}
|
||||
|
||||
|
|
@ -766,8 +760,7 @@ fn test_invalid_arg_number_with_abort_returns_status_2() {
|
|||
fn test_invalid_arg_number_with_fail_returns_status_2() {
|
||||
new_ucmd!()
|
||||
.args(&["--invalid=fail", "4Q"])
|
||||
.fails()
|
||||
.code_is(2)
|
||||
.fails_with_code(2)
|
||||
.stdout_is("4Q\n")
|
||||
.stderr_is("numfmt: invalid suffix in input: '4Q'\n");
|
||||
}
|
||||
|
|
@ -778,8 +771,7 @@ fn test_invalid_argument_returns_status_1() {
|
|||
.args(&["--header=hello"])
|
||||
.pipe_in("53478")
|
||||
.ignore_stdin_write_error()
|
||||
.fails()
|
||||
.code_is(1);
|
||||
.fails_with_code(1);
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
|
@ -790,8 +782,7 @@ fn test_invalid_padding_value() {
|
|||
new_ucmd!()
|
||||
.arg(format!("--padding={padding_value}"))
|
||||
.arg("5")
|
||||
.fails()
|
||||
.code_is(1)
|
||||
.fails_with_code(1)
|
||||
.stderr_contains(format!("invalid padding value '{padding_value}'"));
|
||||
}
|
||||
}
|
||||
|
|
@ -821,8 +812,7 @@ fn test_invalid_unit_size() {
|
|||
for invalid_size in &invalid_sizes {
|
||||
new_ucmd!()
|
||||
.arg(format!("--{command}-unit={invalid_size}"))
|
||||
.fails()
|
||||
.code_is(1)
|
||||
.fails_with_code(1)
|
||||
.stderr_contains(format!("invalid unit size: '{invalid_size}'"));
|
||||
}
|
||||
}
|
||||
|
|
@ -835,8 +825,7 @@ fn test_valid_but_forbidden_suffix() {
|
|||
for number in numbers {
|
||||
new_ucmd!()
|
||||
.arg(number)
|
||||
.fails()
|
||||
.code_is(2)
|
||||
.fails_with_code(2)
|
||||
.stderr_contains(format!(
|
||||
"rejecting suffix in input: '{number}' (consider using --from)"
|
||||
));
|
||||
|
|
@ -1011,8 +1000,7 @@ fn test_format_without_percentage_directive() {
|
|||
for invalid_format in invalid_formats {
|
||||
new_ucmd!()
|
||||
.arg(format!("--format={invalid_format}"))
|
||||
.fails()
|
||||
.code_is(1)
|
||||
.fails_with_code(1)
|
||||
.stderr_contains(format!("format '{invalid_format}' has no % directive"));
|
||||
}
|
||||
}
|
||||
|
|
@ -1023,8 +1011,7 @@ fn test_format_with_percentage_directive_at_end() {
|
|||
|
||||
new_ucmd!()
|
||||
.arg(format!("--format={invalid_format}"))
|
||||
.fails()
|
||||
.code_is(1)
|
||||
.fails_with_code(1)
|
||||
.stderr_contains(format!("format '{invalid_format}' ends in %"));
|
||||
}
|
||||
|
||||
|
|
@ -1034,8 +1021,7 @@ fn test_format_with_too_many_percentage_directives() {
|
|||
|
||||
new_ucmd!()
|
||||
.arg(format!("--format={invalid_format}"))
|
||||
.fails()
|
||||
.code_is(1)
|
||||
.fails_with_code(1)
|
||||
.stderr_contains(format!(
|
||||
"format '{invalid_format}' has too many % directives"
|
||||
));
|
||||
|
|
@ -1048,8 +1034,7 @@ fn test_format_with_invalid_format() {
|
|||
for invalid_format in invalid_formats {
|
||||
new_ucmd!()
|
||||
.arg(format!("--format={invalid_format}"))
|
||||
.fails()
|
||||
.code_is(1)
|
||||
.fails_with_code(1)
|
||||
.stderr_contains(format!(
|
||||
"invalid format '{invalid_format}', directive must be %[0]['][-][N][.][N]f"
|
||||
));
|
||||
|
|
@ -1061,8 +1046,7 @@ fn test_format_with_width_overflow() {
|
|||
let invalid_format = "%18446744073709551616f";
|
||||
new_ucmd!()
|
||||
.arg(format!("--format={invalid_format}"))
|
||||
.fails()
|
||||
.code_is(1)
|
||||
.fails_with_code(1)
|
||||
.stderr_contains(format!(
|
||||
"invalid format '{invalid_format}' (width overflow)"
|
||||
));
|
||||
|
|
@ -1075,8 +1059,7 @@ fn test_format_with_invalid_precision() {
|
|||
for invalid_format in invalid_formats {
|
||||
new_ucmd!()
|
||||
.arg(format!("--format={invalid_format}"))
|
||||
.fails()
|
||||
.code_is(1)
|
||||
.fails_with_code(1)
|
||||
.stderr_contains(format!("invalid precision in format '{invalid_format}'"));
|
||||
}
|
||||
}
|
||||
|
|
@ -1085,7 +1068,6 @@ fn test_format_with_invalid_precision() {
|
|||
fn test_format_grouping_conflicts_with_to_option() {
|
||||
new_ucmd!()
|
||||
.args(&["--format=%'f", "--to=si"])
|
||||
.fails()
|
||||
.code_is(1)
|
||||
.fails_with_code(1)
|
||||
.stderr_contains("grouping cannot be combined with --to");
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue