Merge pull request #7677 from shskwmt/test-cp-acl-preserve

cakebaker · web-flow · commit f1f3a5d9d2d2 · 2025-04-06T17:41:40.000+02:00
test/cp: Fix "No such file or directory" error in test_acl_preserve
diff --git a/tests/by-util/test_cp.rs b/tests/by-util/test_cp.rs
@@ -4055,11 +4055,11 @@ fn test_acl_preserve() {
     at.mkdir(path2);
     at.touch(file);
 
-    let path = at.plus_as_string(file);
+    let path1 = at.plus_as_string(path1);
     // 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(["-m", "group::rwx", path1])
+        .args(["-m", "group::rwx", &path1])
         .status()
         .map(|status| status.code())
     {
@@ -4074,6 +4074,7 @@ fn test_acl_preserve() {
         }
     }
 
+    let path = at.plus_as_string(file);
     scene.ucmd().args(&["-p", &path, path2]).succeeds();
 
     assert!(compare_xattrs(&file, &file_target));

Original file line number	Diff line number	Diff line change
`@@ -4055,11 +4055,11 @@ fn test_acl_preserve() {`
`4055`	`4055`	`at.mkdir(path2);`
`4056`	`4056`	`at.touch(file);`
`4057`	`4057`
`4058`		`- let path = at.plus_as_string(file);`
	`4058`	`+ let path1 = at.plus_as_string(path1);`
`4059`	`4059`	`// calling the command directly. xattr requires some dev packages to be installed`
`4060`	`4060`	`// and it adds a complex dependency just for a test`
`4061`	`4061`	`match Command::new("setfacl")`
`4062`		`- .args(["-m", "group::rwx", path1])`
	`4062`	`+ .args(["-m", "group::rwx", &path1])`
`4063`	`4063`	`.status()`
`4064`	`4064`	`.map(\|status\| status.code())`
`4065`	`4065`	`{`
`@@ -4074,6 +4074,7 @@ fn test_acl_preserve() {`
`4074`	`4074`	`}`
`4075`	`4075`	`}`
`4076`	`4076`
	`4077`	`+ let path = at.plus_as_string(file);`
`4077`	`4078`	`scene.ucmd().args(&["-p", &path, path2]).succeeds();`
`4078`	`4079`
`4079`	`4080`	`assert!(compare_xattrs(&file, &file_target));`