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

Merge pull request #3671 from niyaznigmatullin/fix_realpath_test

Browse source 
test_realpath: fixed test to be the one that was supposed to be
This commit is contained in:
Sylvestre Ledru 2022-07-06 09:42:15 +02:00 • committed by GitHub
commit 43a5b8c7d7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 37 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

26
tests/by-util/test_realpath.rs
View file

@ -219,7 +219,7 @@ fn test_realpath_when_symlink_is_absolute_and_enoent() {
at.mkdir("dir1");
at.symlink_file("dir2/bar", "dir1/foo1");
at.symlink_file("/dir2/bar", "dir1/foo2");
at.relative_symlink_file("dir2/baz", at.plus("dir1/foo3").to_str().unwrap());
at.relative_symlink_file("../dir2/baz", "dir1/foo3");
#[cfg(unix)]
ucmd.arg("dir1/foo1")
@ -228,7 +228,7 @@ fn test_realpath_when_symlink_is_absolute_and_enoent() {
.run()
.stdout_contains("/dir2/bar\n")
.stdout_contains("/dir2/baz\n")
.stderr_is("realpath: dir1/foo2: No such file or directory");
.stderr_is("realpath: dir1/foo2: No such file or directory\n");
#[cfg(windows)]
ucmd.arg("dir1/foo1")
@ -239,3 +239,25 @@ fn test_realpath_when_symlink_is_absolute_and_enoent() {
.stdout_contains("\\dir2\\baz\n")
.stderr_is("realpath: dir1/foo2: No such file or directory");
}
#[test]
#[ignore = "issue #3669"]
fn test_realpath_when_symlink_part_is_missing() {
let (at, mut ucmd) = at_and_ucmd!();
at.mkdir("dir2");
at.touch("dir2/bar");
at.mkdir("dir1");
at.relative_symlink_file("../dir2/bar", "dir1/foo1");
at.relative_symlink_file("dir2/bar", "dir1/foo2");
at.relative_symlink_file("../dir2/baz", "dir1/foo3");
at.symlink_file("dir3/bar", "dir1/foo4");
ucmd.args(&["dir1/foo1", "dir1/foo2", "dir1/foo3", "dir1/foo4"])
.run()
.stdout_contains(at.plus_as_string("dir2/bar") + "\n")
.stdout_contains(at.plus_as_string("dir2/baz") + "\n")
.stderr_contains("realpath: dir1/foo2: No such file or directory\n")
.stderr_contains("realpath: dir1/foo4: No such file or directory\n");
}

15
tests/common/util.rs
View file

@ -702,8 +702,11 @@ impl AtPath {
}
pub fn relative_symlink_file(&self, original: &str, link: &str) {
log_info("symlink", &format!("{},{}", original, link));
symlink_file(original, link).unwrap();
log_info(
"symlink",
&format!("{},{}", original, &self.plus_as_string(link)),
);
symlink_file(original, &self.plus(link)).unwrap();
}
pub fn symlink_dir(&self, original: &str, link: &str) {
@ -718,6 +721,14 @@ impl AtPath {
symlink_dir(&self.plus(original), &self.plus(link)).unwrap();
}
pub fn relative_symlink_dir(&self, original: &str, link: &str) {
log_info(
"symlink",
&format!("{},{}", original, &self.plus_as_string(link)),
);
symlink_dir(original, &self.plus(link)).unwrap();
}
pub fn is_symlink(&self, path: &str) -> bool {
log_info("is_symlink", self.plus_as_string(path));
match fs::symlink_metadata(&self.plus(path)) {