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

install: various improvements in output & tests

This commit is contained in:
Sylvestre Ledru 2020-11-19 22:28:13 +01:00
parent 3024ade071
commit dca1f28085
7 changed files with 41 additions and 34 deletions

View file

@ -110,7 +110,7 @@ fn test_reference() {
.arg("--reference=/etc/passwd")
.arg("/etc")
.fails()
.stderr_is("chgrp: changing group of '/etc': Operation not permitted (os error 1)\nfailed to change group of /etc from root to root");
.stderr_is("chgrp: changing group of '/etc': Operation not permitted (os error 1)\nfailed to change group of '/etc' from root to root");
}
}

View file

@ -1,5 +1,6 @@
use crate::common::util::*;
use rust_users::*;
#[cfg(target_os = "linux")]
use rust_users::get_effective_uid;
extern crate chown;
@ -345,7 +346,9 @@ fn test_chown_recursive() {
// As seems to be a configuration issue, ignoring it
return;
}
assert!(result.stdout.contains("ownership of a/a retained as"));
assert!(result.stderr.contains("ownership of 'a/a' retained as"));
assert!(result.stderr.contains("ownership of 'z/y' retained as"));
assert!(result.success);
}
@ -378,6 +381,7 @@ fn test_root_preserve() {
assert!(result
.stderr
.contains("chown: it is dangerous to operate recursively"));
}
#[cfg(target_os = "linux")]
fn test_big_p() {

View file

@ -216,13 +216,23 @@ fn test_install_target_new_file_with_group() {
at.touch(file);
at.mkdir(dir);
ucmd.arg(file)
let result = ucmd
.arg(file)
.arg("--group")
.arg(gid.to_string())
.arg(format!("{}/{}", dir, file))
.succeeds()
.no_stderr();
.run();
println!("stderr = {:?}", result.stderr);
println!("stdout = {:?}", result.stdout);
if is_ci() && result.stderr.contains("error: no such group:") {
// In the CI, some server are failing to return the group.
// As seems to be a configuration issue, ignoring it
return;
}
assert!(result.success);
assert!(at.file_exists(file));
assert!(at.file_exists(&format!("{}/{}", dir, file)));
}
@ -236,13 +246,23 @@ fn test_install_target_new_file_with_owner() {
at.touch(file);
at.mkdir(dir);
ucmd.arg(file)
let result = ucmd
.arg(file)
.arg("--owner")
.arg(uid.to_string())
.arg(format!("{}/{}", dir, file))
.succeeds()
.no_stderr();
.run();
println!("stderr = {:?}", result.stderr);
println!("stdout = {:?}", result.stdout);
if is_ci() && result.stderr.contains("error: no such user:") {
// In the CI, some server are failing to return the user id.
// As seems to be a configuration issue, ignoring it
return;
}
assert!(result.success);
assert!(at.file_exists(file));
assert!(at.file_exists(&format!("{}/{}", dir, file)));
}