[mq] [skip ddci] working branch - merge 45bd86a on top of main at bca1af9

gh-worker-dd-mergequeue-cf854d[bot] · web-flow · commit f66012f7507c · 2026-04-02T15:53:36.000Z
{"baseBranch":"main","baseCommit":"bca1af94e1d01625efb0ef3e2d47c918d38c6a4f","createdAt":"2026-04-02T15:53:27.196202Z","headSha":"45bd86a53ae10f435517e10969c8da1b6211a263","id":"917bbe58-5bbc-4725-a5fa-5684c6b9fbc5","priority":"200","pullRequestNumber":"1841","queuedAt":"2026-04-02T15:53:27.194978Z","retryAttempt":"1","status":"STATUS_QUEUED"}
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/libdd-common/Cargo.toml b/libdd-common/Cargo.toml
@@ -89,7 +89,6 @@ multer = "3.1"
 bytes = "1.11.1"
 rand = "0.8"
 tempfile = "3.8"
-rusty-fork = "0.3"
 tokio = { version = "1.23", features = ["rt", "macros", "time"] }
 
 [features]
diff --git a/libdd-common/src/test_utils.rs b/libdd-common/src/test_utils.rs
@@ -419,7 +419,6 @@ async fn parse_multipart(boundary: String, body: Vec<u8>) -> anyhow::Result<Vec<
 #[cfg(test)]
 mod tests {
     use super::*;
-    use rusty_fork::rusty_fork_test;
 
     #[test]
     fn test_temp_file_guard_and_path_generation() {
@@ -516,58 +515,55 @@ mod tests {
         assert_eq!(parsed.multipart_parts[0].content, b"value");
     }
 
-    // This test must run in its own process to get accurate thread counts,
-    // since the test runner and other parallel tests spawn threads.
-    rusty_fork_test! {
-        #[test]
-        #[cfg_attr(miri, ignore)]
-        fn test_count_active_threads() {
-            use crate::test_utils::count_active_threads;
-
-            let initial_count = count_active_threads().expect("Failed to count threads");
-            assert!(
-                initial_count >= 1,
-                "Expected at least 1 thread, got {}",
-                initial_count
-            );
-
-            // Spawn some threads and verify the count increases
-            use std::sync::{Arc, Barrier};
-            let barrier = Arc::new(Barrier::new(6)); // 5 spawned threads + main thread
-
-            let handles: Vec<_> = (0..5)
-                .map(|_| {
-                    let barrier = Arc::clone(&barrier);
-                    std::thread::spawn(move || {
-                        barrier.wait();
-                        std::thread::sleep(std::time::Duration::from_millis(50));
-                    })
+    // Skipping this test because it is flaky on CentOS, due to the helper threads that are spawned
+    #[test]
+    #[ignore]
+    fn test_count_active_threads() {
+        use crate::test_utils::count_active_threads;
+
+        let initial_count = count_active_threads().expect("Failed to count threads");
+        assert!(
+            initial_count >= 1,
+            "Expected at least 1 thread, got {}",
+            initial_count
+        );
+
+        // Spawn some threads and verify the count increases
+        use std::sync::{Arc, Barrier};
+        let barrier = Arc::new(Barrier::new(6)); // 5 spawned threads + main thread
+
+        let handles: Vec<_> = (0..5)
+            .map(|_| {
+                let barrier = Arc::clone(&barrier);
+                std::thread::spawn(move || {
+                    barrier.wait();
+                    std::thread::sleep(std::time::Duration::from_millis(50));
                 })
-                .collect();
-
-            barrier.wait();
-            let count_with_threads = count_active_threads().expect("Failed to count threads");
-            assert!(
-                count_with_threads >= initial_count + 5,
-                "Expected at least {} threads (initial: {}, with 5 spawned: {})",
-                initial_count + 5,
-                initial_count,
-                count_with_threads
-            );
-
-            for handle in handles {
-                handle.join().expect("Thread should join successfully");
-            }
+            })
+            .collect();
+
+        barrier.wait();
+        let count_with_threads = count_active_threads().expect("Failed to count threads");
+        assert!(
+            count_with_threads >= initial_count + 5,
+            "Expected at least {} threads (initial: {}, with 5 spawned: {})",
+            initial_count + 5,
+            initial_count,
+            count_with_threads
+        );
 
-            let count_after_join = count_active_threads().expect("Failed to count threads");
-            // Allow up to 1 extra: some platforms (e.g. CentOS 7) lazily spawn a helper thread
-            assert!(
-                count_after_join <= initial_count + 1,
-                "Expected thread count to return to {} or {} after join, got {}",
-                initial_count,
-                initial_count + 1,
-                count_after_join
-            );
+        for handle in handles {
+            handle.join().expect("Thread should join successfully");
         }
+
+        let count_after_join = count_active_threads().expect("Failed to count threads");
+        // Allow up to 1 extra: some platforms (e.g. CentOS 7) lazily spawn a helper thread
+        assert!(
+            count_after_join <= initial_count + 1,
+            "Expected thread count to return to {} or {} after join, got {}",
+            initial_count,
+            initial_count + 1,
+            count_after_join
+        );
     }
 }
