Merge pull request #6527 from Its-Just-Nans/add-ls-test

sylvestre · web-flow · commit af8e820b5e33 · 2024-07-03T08:09:55.000+02:00
ls: add test
diff --git a/src/uu/ls/src/ls.rs b/src/uu/ls/src/ls.rs
@@ -3369,7 +3369,6 @@ fn display_inode(metadata: &Metadata) -> String {
 
 // This returns the SELinux security context as UTF8 `String`.
 // In the long term this should be changed to `OsStr`, see discussions at #2621/#2656
-#[allow(unused_variables)]
 fn get_security_context(config: &Config, p_buf: &Path, must_dereference: bool) -> String {
     let substitute_string = "?".to_string();
     // If we must dereference, ensure that the symlink is actually valid even if the system
@@ -3383,7 +3382,7 @@ fn get_security_context(config: &Config, p_buf: &Path, must_dereference: bool) -
                 show!(LsError::IOErrorContext(err, p_buf.to_path_buf(), false));
                 return substitute_string;
             }
-            Ok(md) => (),
+            Ok(_md) => (),
         }
     }
     if config.selinux_supported {
diff --git a/tests/by-util/test_ls.rs b/tests/by-util/test_ls.rs
@@ -2992,6 +2992,35 @@ fn test_ls_align_unquoted() {
     }
 }
 
+#[test]
+fn test_ls_align_unquoted_multiline() {
+    let scene = TestScenario::new(util_name!());
+    let at = &scene.fixtures;
+
+    at.touch("one");
+    at.touch("two");
+    at.touch("three_long");
+    at.touch("four_long");
+    at.touch("five");
+    at.touch("s ix");
+    at.touch("s even");
+    at.touch("eight_long_long");
+    at.touch("nine");
+    at.touch("ten");
+
+    // In TTY
+    #[cfg(unix)]
+    scene
+        .ucmd()
+        .arg("--color")
+        .terminal_simulation(true)
+        .succeeds()
+        .stdout_only(concat!(
+            " eight_long_long   four_long   one      's ix'   three_long\r\n",
+            " five              nine       's even'   ten     two\r\n"
+        ));
+}
+
 #[test]
 fn test_ls_ignore_hide() {
     let scene = TestScenario::new(util_name!());

Original file line number	Diff line number	Diff line change
`@@ -3369,7 +3369,6 @@ fn display_inode(metadata: &Metadata) -> String {`
`3369`	`3369`
`3370`	`3370`	// This returns the SELinux security context as UTF8 `String`.
`3371`	`3371`	// In the long term this should be changed to `OsStr`, see discussions at #2621/#2656
`3372`		`-#[allow(unused_variables)]`
`3373`	`3372`	`fn get_security_context(config: &Config, p_buf: &Path, must_dereference: bool) -> String {`
`3374`	`3373`	`let substitute_string = "?".to_string();`
`3375`	`3374`	`// If we must dereference, ensure that the symlink is actually valid even if the system`
`@@ -3383,7 +3382,7 @@ fn get_security_context(config: &Config, p_buf: &Path, must_dereference: bool) -`
`3383`	`3382`	`show!(LsError::IOErrorContext(err, p_buf.to_path_buf(), false));`
`3384`	`3383`	`return substitute_string;`
`3385`	`3384`	`}`
`3386`		`- Ok(md) => (),`
	`3385`	`+ Ok(_md) => (),`
`3387`	`3386`	`}`
`3388`	`3387`	`}`
`3389`	`3388`	`if config.selinux_supported {`