mirror of
https://github.com/RGBCube/uutils-coreutils
synced 2025-07-28 11:37: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
|
|
@ -59,7 +59,7 @@ impl Drop for Target {
|
|||
|
||||
#[test]
|
||||
fn test_invalid_arg() {
|
||||
new_ucmd!().arg("--definitely-invalid").fails().code_is(125);
|
||||
new_ucmd!().arg("--definitely-invalid").fails_with_code(125);
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
|
@ -84,8 +84,7 @@ fn test_env_version() {
|
|||
fn test_env_permissions() {
|
||||
new_ucmd!()
|
||||
.arg(".")
|
||||
.fails()
|
||||
.code_is(126)
|
||||
.fails_with_code(126)
|
||||
.stderr_is("env: '.': Permission denied\n");
|
||||
}
|
||||
|
||||
|
|
@ -537,106 +536,91 @@ fn test_env_parsing_errors() {
|
|||
|
||||
ts.ucmd()
|
||||
.arg("-S\\|echo hallo") // no quotes, invalid escape sequence |
|
||||
.fails()
|
||||
.code_is(125)
|
||||
.fails_with_code(125)
|
||||
.no_stdout()
|
||||
.stderr_is("env: invalid sequence '\\|' in -S\n");
|
||||
|
||||
ts.ucmd()
|
||||
.arg("-S\\a") // no quotes, invalid escape sequence a
|
||||
.fails()
|
||||
.code_is(125)
|
||||
.fails_with_code(125)
|
||||
.no_stdout()
|
||||
.stderr_is("env: invalid sequence '\\a' in -S\n");
|
||||
|
||||
ts.ucmd()
|
||||
.arg("-S\"\\a\"") // double quotes, invalid escape sequence a
|
||||
.fails()
|
||||
.code_is(125)
|
||||
.fails_with_code(125)
|
||||
.no_stdout()
|
||||
.stderr_is("env: invalid sequence '\\a' in -S\n");
|
||||
|
||||
ts.ucmd()
|
||||
.arg(r#"-S"\a""#) // same as before, just using r#""#
|
||||
.fails()
|
||||
.code_is(125)
|
||||
.fails_with_code(125)
|
||||
.no_stdout()
|
||||
.stderr_is("env: invalid sequence '\\a' in -S\n");
|
||||
|
||||
ts.ucmd()
|
||||
.arg("-S'\\a'") // single quotes, invalid escape sequence a
|
||||
.fails()
|
||||
.code_is(125)
|
||||
.fails_with_code(125)
|
||||
.no_stdout()
|
||||
.stderr_is("env: invalid sequence '\\a' in -S\n");
|
||||
|
||||
ts.ucmd()
|
||||
.arg(r"-S\|\&\;") // no quotes, invalid escape sequence |
|
||||
.fails()
|
||||
.code_is(125)
|
||||
.fails_with_code(125)
|
||||
.no_stdout()
|
||||
.stderr_is("env: invalid sequence '\\|' in -S\n");
|
||||
|
||||
ts.ucmd()
|
||||
.arg(r"-S\<\&\;") // no quotes, invalid escape sequence <
|
||||
.fails()
|
||||
.code_is(125)
|
||||
.fails_with_code(125)
|
||||
.no_stdout()
|
||||
.stderr_is("env: invalid sequence '\\<' in -S\n");
|
||||
|
||||
ts.ucmd()
|
||||
.arg(r"-S\>\&\;") // no quotes, invalid escape sequence >
|
||||
.fails()
|
||||
.code_is(125)
|
||||
.fails_with_code(125)
|
||||
.no_stdout()
|
||||
.stderr_is("env: invalid sequence '\\>' in -S\n");
|
||||
|
||||
ts.ucmd()
|
||||
.arg(r"-S\`\&\;") // no quotes, invalid escape sequence `
|
||||
.fails()
|
||||
.code_is(125)
|
||||
.fails_with_code(125)
|
||||
.no_stdout()
|
||||
.stderr_is("env: invalid sequence '\\`' in -S\n");
|
||||
|
||||
ts.ucmd()
|
||||
.arg(r#"-S"\`\&\;""#) // double quotes, invalid escape sequence `
|
||||
.fails()
|
||||
.code_is(125)
|
||||
.fails_with_code(125)
|
||||
.no_stdout()
|
||||
.stderr_is("env: invalid sequence '\\`' in -S\n");
|
||||
|
||||
ts.ucmd()
|
||||
.arg(r"-S'\`\&\;'") // single quotes, invalid escape sequence `
|
||||
.fails()
|
||||
.code_is(125)
|
||||
.fails_with_code(125)
|
||||
.no_stdout()
|
||||
.stderr_is("env: invalid sequence '\\`' in -S\n");
|
||||
|
||||
ts.ucmd()
|
||||
.arg(r"-S\`") // ` escaped without quotes
|
||||
.fails()
|
||||
.code_is(125)
|
||||
.fails_with_code(125)
|
||||
.no_stdout()
|
||||
.stderr_is("env: invalid sequence '\\`' in -S\n");
|
||||
|
||||
ts.ucmd()
|
||||
.arg(r#"-S"\`""#) // ` escaped in double quotes
|
||||
.fails()
|
||||
.code_is(125)
|
||||
.fails_with_code(125)
|
||||
.no_stdout()
|
||||
.stderr_is("env: invalid sequence '\\`' in -S\n");
|
||||
|
||||
ts.ucmd()
|
||||
.arg(r"-S'\`'") // ` escaped in single quotes
|
||||
.fails()
|
||||
.code_is(125)
|
||||
.fails_with_code(125)
|
||||
.no_stdout()
|
||||
.stderr_is("env: invalid sequence '\\`' in -S\n");
|
||||
|
||||
ts.ucmd()
|
||||
.args(&[r"-S\🦉"]) // ` escaped in single quotes
|
||||
.fails()
|
||||
.code_is(125)
|
||||
.fails_with_code(125)
|
||||
.no_stdout()
|
||||
.stderr_is("env: invalid sequence '\\\u{FFFD}' in -S\n"); // gnu doesn't show the owl. Instead a invalid unicode ?
|
||||
}
|
||||
|
|
@ -647,8 +631,7 @@ fn test_env_with_empty_executable_single_quotes() {
|
|||
|
||||
ts.ucmd()
|
||||
.args(&["-S''"]) // empty single quotes, considered as program name
|
||||
.fails()
|
||||
.code_is(127)
|
||||
.fails_with_code(127)
|
||||
.no_stdout()
|
||||
.stderr_is("env: '': No such file or directory\n"); // gnu version again adds escaping here
|
||||
}
|
||||
|
|
@ -659,8 +642,7 @@ fn test_env_with_empty_executable_double_quotes() {
|
|||
|
||||
ts.ucmd()
|
||||
.args(&["-S\"\""]) // empty double quotes, considered as program name
|
||||
.fails()
|
||||
.code_is(127)
|
||||
.fails_with_code(127)
|
||||
.no_stdout()
|
||||
.stderr_is("env: '': No such file or directory\n");
|
||||
}
|
||||
|
|
@ -801,23 +783,19 @@ fn test_env_arg_ignore_signal_invalid_signals() {
|
|||
let ts = TestScenario::new(util_name!());
|
||||
ts.ucmd()
|
||||
.args(&["--ignore-signal=banana"])
|
||||
.fails()
|
||||
.code_is(125)
|
||||
.fails_with_code(125)
|
||||
.stderr_contains("env: 'banana': invalid signal");
|
||||
ts.ucmd()
|
||||
.args(&["--ignore-signal=SIGbanana"])
|
||||
.fails()
|
||||
.code_is(125)
|
||||
.fails_with_code(125)
|
||||
.stderr_contains("env: 'SIGbanana': invalid signal");
|
||||
ts.ucmd()
|
||||
.args(&["--ignore-signal=exit"])
|
||||
.fails()
|
||||
.code_is(125)
|
||||
.fails_with_code(125)
|
||||
.stderr_contains("env: 'exit': invalid signal");
|
||||
ts.ucmd()
|
||||
.args(&["--ignore-signal=SIGexit"])
|
||||
.fails()
|
||||
.code_is(125)
|
||||
.fails_with_code(125)
|
||||
.stderr_contains("env: 'SIGexit': invalid signal");
|
||||
}
|
||||
|
||||
|
|
@ -829,32 +807,28 @@ fn test_env_arg_ignore_signal_special_signals() {
|
|||
let signal_kill = nix::sys::signal::SIGKILL;
|
||||
ts.ucmd()
|
||||
.args(&["--ignore-signal=stop", "echo", "hello"])
|
||||
.fails()
|
||||
.code_is(125)
|
||||
.fails_with_code(125)
|
||||
.stderr_contains(format!(
|
||||
"env: failed to set signal action for signal {}: Invalid argument",
|
||||
signal_stop as i32
|
||||
));
|
||||
ts.ucmd()
|
||||
.args(&["--ignore-signal=kill", "echo", "hello"])
|
||||
.fails()
|
||||
.code_is(125)
|
||||
.fails_with_code(125)
|
||||
.stderr_contains(format!(
|
||||
"env: failed to set signal action for signal {}: Invalid argument",
|
||||
signal_kill as i32
|
||||
));
|
||||
ts.ucmd()
|
||||
.args(&["--ignore-signal=SToP", "echo", "hello"])
|
||||
.fails()
|
||||
.code_is(125)
|
||||
.fails_with_code(125)
|
||||
.stderr_contains(format!(
|
||||
"env: failed to set signal action for signal {}: Invalid argument",
|
||||
signal_stop as i32
|
||||
));
|
||||
ts.ucmd()
|
||||
.args(&["--ignore-signal=SIGKILL", "echo", "hello"])
|
||||
.fails()
|
||||
.code_is(125)
|
||||
.fails_with_code(125)
|
||||
.stderr_contains(format!(
|
||||
"env: failed to set signal action for signal {}: Invalid argument",
|
||||
signal_kill as i32
|
||||
|
|
@ -898,19 +872,16 @@ fn disallow_equals_sign_on_short_unset_option() {
|
|||
|
||||
ts.ucmd()
|
||||
.arg("-u=")
|
||||
.fails()
|
||||
.code_is(125)
|
||||
.fails_with_code(125)
|
||||
.stderr_contains("env: cannot unset '=': Invalid argument");
|
||||
ts.ucmd()
|
||||
.arg("-u=A1B2C3")
|
||||
.fails()
|
||||
.code_is(125)
|
||||
.fails_with_code(125)
|
||||
.stderr_contains("env: cannot unset '=A1B2C3': Invalid argument");
|
||||
ts.ucmd().arg("--split-string=A1B=2C3=").succeeds();
|
||||
ts.ucmd()
|
||||
.arg("--unset=")
|
||||
.fails()
|
||||
.code_is(125)
|
||||
.fails_with_code(125)
|
||||
.stderr_contains("env: cannot unset '': Invalid argument");
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue