1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-29 12:07:46 +00:00

rm: refactor tests for #1982

This commit is contained in:
Jan Scheer 2021-04-06 00:04:49 +02:00
parent cc30aead22
commit 057ceebdb0

View file

@ -15,14 +15,12 @@ fn test_rm_one_file() {
#[test] #[test]
fn test_rm_failed() { fn test_rm_failed() {
let (_at, mut ucmd) = at_and_ucmd!(); let (_at, mut ucmd) = at_and_ucmd!();
let file = "test_rm_one_file"; let file = "test_rm_one_file"; // Doesn't exist
let result = ucmd.arg(file).fails(); // Doesn't exist ucmd.arg(file).fails().stderr_contains(&format!(
assert!(result.stderr.contains(&format!(
"cannot remove '{}': No such file or directory", "cannot remove '{}': No such file or directory",
file file
))); ));
} }
#[test] #[test]
@ -145,10 +143,10 @@ fn test_rm_non_empty_directory() {
at.mkdir(dir); at.mkdir(dir);
at.touch(file_a); at.touch(file_a);
let result = ucmd.arg("-d").arg(dir).fails(); ucmd.arg("-d")
assert!(result .arg(dir)
.stderr .fails()
.contains(&format!("cannot remove '{}': Directory not empty", dir))); .stderr_contains(&format!("cannot remove '{}': Directory not empty", dir));
assert!(at.file_exists(file_a)); assert!(at.file_exists(file_a));
assert!(at.dir_exists(dir)); assert!(at.dir_exists(dir));
} }
@ -178,11 +176,9 @@ fn test_rm_directory_without_flag() {
at.mkdir(dir); at.mkdir(dir);
let result = ucmd.arg(dir).fails(); ucmd.arg(dir)
println!("{}", result.stderr); .fails()
assert!(result .stderr_contains(&format!("cannot remove '{}': Is a directory", dir));
.stderr
.contains(&format!("cannot remove '{}': Is a directory", dir)));
} }
#[test] #[test]
@ -229,10 +225,11 @@ fn test_rm_symlink_dir() {
at.mkdir(dir); at.mkdir(dir);
at.symlink_dir(dir, link); at.symlink_dir(dir, link);
let result = scene.ucmd().arg(link).fails(); scene
assert!(result .ucmd()
.stderr .arg(link)
.contains(&format!("cannot remove '{}': Is a directory", link))); .fails()
.stderr_contains(&format!("cannot remove '{}': Is a directory", link));
assert!(at.dir_exists(link)); assert!(at.dir_exists(link));