Skip to content

test_ls: Improve acl test #7816

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 21, 2025
Merged

test_ls: Improve acl test #7816

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 16 additions & 7 deletions tests/by-util/test_ls.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// For the full copyright and license information, please view the LICENSE
// file that was distributed with this source code.
// spell-checker:ignore (words) READMECAREFULLY birthtime doesntexist oneline somebackup lrwx somefile somegroup somehiddenbackup somehiddenfile tabsize aaaaaaaa bbbb cccc dddddddd ncccc neee naaaaa nbcdef nfffff dired subdired tmpfs mdir COLORTERM mexe bcdef mfoo
// spell-checker:ignore (words) fakeroot setcap
// spell-checker:ignore (words) fakeroot setcap drwxr
#![allow(
clippy::similar_names,
clippy::too_many_lines,
Expand Down Expand Up @@ -5313,14 +5313,15 @@ fn test_acl_display() {

let scene = TestScenario::new(util_name!());
let at = &scene.fixtures;
let path = "a42";
at.mkdir(path);

let path = at.plus_as_string(path);
at.mkdir("with_acl");
let path_with_acl = at.plus_as_string("with_acl");
at.mkdir("without_acl");

// calling the command directly. xattr requires some dev packages to be installed
// and it adds a complex dependency just for a test
match Command::new("setfacl")
.args(["-d", "-m", "group::rwx", &path])
.args(["-d", "-m", "group::rwx", &path_with_acl])
.status()
.map(|status| status.code())
{
Expand All @@ -5335,11 +5336,19 @@ fn test_acl_display() {
}
}

// Expected output (we just look for `+` presence and absence in the first column):
// ...
// drwxr-xr-x+ 2 user group 40 Apr 21 12:44 with_acl
// drwxr-xr-x 2 user group 40 Apr 21 12:44 without_acl
let re_with_acl = Regex::new(r"[a-z-]*\+ .*with_acl").unwrap();
let re_without_acl = Regex::new(r"[a-z-]* .*without_acl").unwrap();

scene
.ucmd()
.args(&["-lda", &path])
.args(&["-la", &at.as_string()])
.succeeds()
.stdout_contains("+");
.stdout_matches(&re_with_acl)
.stdout_matches(&re_without_acl);
}

// Make sure that "ls --color" correctly applies color "normal" to text and
Expand Down
Loading