RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-28 03:27:44 +00:00
Code Issues Activity

chroot: improve support of --skip-chdir

Browse source 
Should unbreak tests/misc/chroot-fail.sh
This commit is contained in:
Sylvestre Ledru 2022-09-30 17:33:52 -10:00
parent d6ca61c279
commit d768b19f2b
2 changed files with 45 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

43
tests/by-util/test_chroot.rs
View file

@ -1,4 +1,4 @@
// spell-checker:ignore (words) araba newroot userspec chdir pwd's
// spell-checker:ignore (words) araba newroot userspec chdir pwd's isroot
use crate::common::util::*;
@ -145,22 +145,37 @@ fn test_chroot() {
}
}
#[test]
fn test_chroot_skip_chdir_not_root() {
let (at, mut ucmd) = at_and_ucmd!();
let dir = "foobar";
at.mkdir(dir);
ucmd.arg("--skip-chdir")
.arg(dir)
.fails()
.stderr_contains("chroot: option --skip-chdir only permitted if NEWROOT is old '/'")
.code_is(125);
}
#[test]
fn test_chroot_skip_chdir() {
let ts = TestScenario::new(util_name!());
let at = &ts.fixtures;
let dir = "CHROOT_DIR";
at.mkdir(dir);
let env_cd = std::env::current_dir().unwrap();
if let Ok(result) = run_ucmd_as_root(&ts, &[dir, "--skip-chdir", "pwd"]) {
// Should return the same path
assert_eq!(
result.success().no_stderr().stdout_str(),
env_cd.to_str().unwrap()
);
} else {
print!("Test skipped; requires root user");
let at = ts.fixtures.clone();
let dirs = ["/", "/.", "/..", "isroot"];
at.symlink_file("/", "isroot");
for dir in dirs {
let env_cd = std::env::current_dir().unwrap();
if let Ok(result) = run_ucmd_as_root(&ts, &[dir, "--skip-chdir"]) {
// Should return the same path
assert_eq!(
result.success().no_stderr().stdout_str(),
env_cd.to_str().unwrap()
);
} else {
print!("Test skipped; requires root user");
}
}
}