improve test

Author: sylvestre

src/uucore/src/lib/features/safe_traversal.rs

@@ -708,6 +708,7 @@ mod tests {
     }
 
     #[test]
+    #[allow(clippy::unnecessary_cast)]
     fn test_file_info() {
         let temp_dir = TempDir::new().unwrap();
         let file_path = temp_dir.path().join("test_file");
@@ -716,7 +717,6 @@ mod tests {
         let dir_fd = DirFd::open(temp_dir.path()).unwrap();
         let stat = dir_fd.stat_at(OsStr::new("test_file"), true).unwrap();
         let file_info = FileInfo::from_stat(&stat);
-        #[allow(clippy::unnecessary_cast)]
         assert_eq!(file_info.device(), stat.st_dev as u64);
         assert_eq!(file_info.inode(), stat.st_ino as u64);
     }
@@ -756,6 +756,7 @@ mod tests {
     }
 
     #[test]
+    #[allow(clippy::unnecessary_cast)]
     fn test_metadata_wrapper() {
         let temp_dir = TempDir::new().unwrap();
         let file_path = temp_dir.path().join("test_file");

tests/by-util/test_du.rs

@@ -212,41 +212,45 @@ fn test_du_soft_link() {
             return;
         }
     }
-    du_soft_link(result.stdout_str());
-}
 
-#[cfg(target_vendor = "apple")]
-fn du_soft_link(s: &str) {
-    // 'macos' host variants may have `du` output variation for soft links
-    assert!((s == "12\tsubdir/links\n") || (s == "16\tsubdir/links\n"));
-}
-#[cfg(target_os = "windows")]
-fn du_soft_link(s: &str) {
-    assert_eq!(s, "8\tsubdir/links\n");
-}
-#[cfg(target_os = "freebsd")]
-fn du_soft_link(s: &str) {
-    // FreeBSD may have different block allocations depending on filesystem
-    // Accept both common sizes
-    let valid_sizes = ["12\tsubdir/links\n", "16\tsubdir/links\n"];
-    assert!(
-        valid_sizes.contains(&s),
-        "Expected one of {:?}, got {}",
-        valid_sizes,
-        s
-    );
-}
-#[cfg(all(
-    not(target_vendor = "apple"),
-    not(target_os = "windows"),
-    not(target_os = "freebsd")
-))]
-fn du_soft_link(s: &str) {
-    // MS-WSL linux has altered expected output
-    if uucore::os::is_wsl_1() {
+    let s = result.stdout_str();
+    println!("Output: {s}");
+    #[cfg(target_vendor = "apple")]
+    {
+        // 'macos' host variants may have `du` output variation for soft links
+        assert!((s == "12\tsubdir/links\n") || (s == "16\tsubdir/links\n"));
+    }
+
+    #[cfg(target_os = "windows")]
+    {
         assert_eq!(s, "8\tsubdir/links\n");
-    } else {
-        assert_eq!(s, "16\tsubdir/links\n");
+    }
+
+    #[cfg(target_os = "freebsd")]
+    {
+        // FreeBSD may have different block allocations depending on filesystem
+        // Accept both common sizes
+        let valid_sizes = ["12\tsubdir/links\n", "16\tsubdir/links\n"];
+        assert!(
+            valid_sizes.contains(&s),
+            "Expected one of {:?}, got {}",
+            valid_sizes,
+            s
+        );
+    }
+
+    #[cfg(all(
+        not(target_vendor = "apple"),
+        not(target_os = "windows"),
+        not(target_os = "freebsd")
+    ))]
+    {
+        // MS-WSL linux has altered expected output
+        if uucore::os::is_wsl_1() {
+            assert_eq!(s, "8\tsubdir/links\n");
+        } else {
+            assert_eq!(s, "16\tsubdir/links\n");
+        }
     }
 }