1
Fork 0
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 2025-03-01 15:29:11 +01:00
parent 76ad6042b5
commit 18cb7dcf9e
90 changed files with 448 additions and 732 deletions

View file

@ -14,7 +14,7 @@ static NOT_A_DIRECTORY: &str = "The directory name is invalid.";
#[test]
fn test_invalid_arg() {
new_ucmd!().arg("--definitely-invalid").fails().code_is(1);
new_ucmd!().arg("--definitely-invalid").fails_with_code(1);
}
#[test]
@ -91,8 +91,7 @@ fn test_symlink_to_itself_verbose() {
let (at, mut ucmd) = at_and_ucmd!();
at.relative_symlink_file("a", "a");
ucmd.args(&["-ev", "a"])
.fails()
.code_is(1)
.fails_with_code(1)
.stderr_contains("Too many levels of symbolic links");
}
@ -104,8 +103,7 @@ fn test_trailing_slash_regular_file() {
scene
.ucmd()
.args(&["-ev", "./regfile/"])
.fails()
.code_is(1)
.fails_with_code(1)
.stderr_contains(NOT_A_DIRECTORY)
.no_stdout();
scene
@ -124,8 +122,7 @@ fn test_trailing_slash_symlink_to_regular_file() {
scene
.ucmd()
.args(&["-ev", "./link/"])
.fails()
.code_is(1)
.fails_with_code(1)
.stderr_contains(NOT_A_DIRECTORY)
.no_stdout();
scene
@ -136,8 +133,7 @@ fn test_trailing_slash_symlink_to_regular_file() {
scene
.ucmd()
.args(&["-e", "./link/more"])
.fails()
.code_is(1)
.fails_with_code(1)
.no_stdout();
}
@ -171,8 +167,7 @@ fn test_trailing_slash_symlink_to_directory() {
scene
.ucmd()
.args(&["-ev", "./link/more"])
.fails()
.code_is(1)
.fails_with_code(1)
.stderr_contains("No such file or directory")
.no_stdout();
}
@ -197,8 +192,7 @@ fn test_trailing_slash_symlink_to_missing() {
scene
.ucmd()
.args(&["-ev", query])
.fails()
.code_is(1)
.fails_with_code(1)
.stderr_contains("No such file or directory")
.no_stdout();
}
@ -219,22 +213,19 @@ fn test_canonicalize_trailing_slash_regfile() {
scene
.ucmd()
.args(&["-fv", &format!("./{name}/")])
.fails()
.code_is(1)
.fails_with_code(1)
.stderr_contains(NOT_A_DIRECTORY)
.no_stdout();
scene
.ucmd()
.args(&["-fv", &format!("{name}/more")])
.fails()
.code_is(1)
.fails_with_code(1)
.stderr_contains(NOT_A_DIRECTORY)
.no_stdout();
scene
.ucmd()
.args(&["-fv", &format!("./{name}/more/")])
.fails()
.code_is(1)
.fails_with_code(1)
.stderr_contains(NOT_A_DIRECTORY)
.no_stdout();
}
@ -270,14 +261,12 @@ fn test_canonicalize_trailing_slash_subdir() {
scene
.ucmd()
.args(&["-f", &format!("{name}/more/more2")])
.fails()
.code_is(1)
.fails_with_code(1)
.no_stdout();
scene
.ucmd()
.args(&["-f", &format!("./{name}/more/more2/")])
.fails()
.code_is(1)
.fails_with_code(1)
.no_stdout();
}
}
@ -301,14 +290,12 @@ fn test_canonicalize_trailing_slash_missing() {
scene
.ucmd()
.args(&["-f", &format!("{name}/more")])
.fails()
.code_is(1)
.fails_with_code(1)
.no_stdout();
scene
.ucmd()
.args(&["-f", &format!("./{name}/more/")])
.fails()
.code_is(1)
.fails_with_code(1)
.no_stdout();
}
}
@ -330,8 +317,7 @@ fn test_canonicalize_trailing_slash_subdir_missing() {
scene
.ucmd()
.args(&["-f", query])
.fails()
.code_is(1)
.fails_with_code(1)
.no_stdout();
}
}
@ -345,8 +331,7 @@ fn test_canonicalize_trailing_slash_symlink_loop() {
scene
.ucmd()
.args(&["-f", query])
.fails()
.code_is(1)
.fails_with_code(1)
.no_stdout();
}
}