Resolve conflicts.

uutils · Jul 11, 2024 · 81cc4d7 · 81cc4d7
1 parent 30ecf22
commit 81cc4d7
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 22 deletions.
diff --git a/src/find/mod.rs b/src/find/mod.rs
@@ -1228,6 +1228,17 @@ mod tests {
         assert_eq!(rc, 0);
     }
 
+    #[test]
+    #[cfg(unix)]
+    fn test_noleaf() {
+        use crate::find::tests::FakeDependencies;
+
+        let deps = FakeDependencies::new();
+        let rc = find_main(&["find", "./test_data/simple/subdir", "-noleaf"], &deps);
+
+        assert_eq!(rc, 0);
+    }
+
     #[test]
     #[cfg(unix)]
     fn test_daystart() {
@@ -1260,15 +1271,6 @@ mod tests {
             ],
             &deps,
         );
-    }
-
-    #[test]
-    #[cfg(unix)]
-    fn test_noleaf() {
-        use crate::find::tests::FakeDependencies;
-
-        let deps = FakeDependencies::new();
-        let rc = find_main(&["find", "./test_data/simple/subdir", "-noleaf"], &deps);
 
         assert_eq!(rc, 0);
     }

diff --git a/tests/find_cmd_tests.rs b/tests/find_cmd_tests.rs
@@ -882,6 +882,18 @@ fn find_samefile() {
         .stderr(predicate::str::contains("not-exist-file"));
 }
 
+#[test]
+#[serial(working_dir)]
+fn find_noleaf() {
+    Command::cargo_bin("find")
+        .expect("found binary")
+        .args(["test_data/simple/subdir", "-noleaf"])
+        .assert()
+        .success()
+        .stdout(predicate::str::contains("test_data/simple/subdir"))
+        .stderr(predicate::str::is_empty());
+}
+
 #[test]
 #[serial(working_dir)]
 fn find_ignore_readdir_race() {
@@ -905,16 +917,4 @@ fn find_ignore_readdir_race() {
         .assert()
         .success()
         .stderr(predicate::str::is_empty());
-}
-
-#[test]
-#[serial(working_dir)]
-fn find_noleaf() {
-    Command::cargo_bin("find")
-        .expect("found binary")
-        .args(["test_data/simple/subdir", "-noleaf"])
-        .assert()
-        .success()
-        .stdout(predicate::str::contains("test_data/simple/subdir"))
-        .stderr(predicate::str::is_empty());
-}
+}