Fixed the 9 failing testcases

Author: steel-bucket

.idea/.gitignore

@@ -94,12 +94,14 @@ fn validate_timeouts(min: Duration, max: Duration, activity: Duration) -> Result
 /// Spawns the command, sets up pipes, and initializes the execution state.
 /// Note: The command passed in should already have pre_exec configured if needed.
 fn spawn_command_and_setup_state(
-    command: StdCommand, // Own command to avoid borrowing issues
+    command: &mut StdCommand,
     initial_deadline: Instant,
 ) -> Result<CommandExecutionState<impl AsyncRead + Unpin, impl AsyncRead + Unpin>, CommandError> {
+    command.stdout(Stdio::piped());
+    command.stderr(Stdio::piped());
 
-    // pass ownership of command
-    let mut tokio_cmd = TokioCommand::from(command);
+    // Command already has pre_exec set by the caller function
+    let mut tokio_cmd = TokioCommand::from(std::mem::replace(command, StdCommand::new("")));
 
     let mut child = tokio_cmd
         .kill_on_drop(true)
@@ -487,8 +489,11 @@ pub async fn run_command_with_timeout(
     };
 
     // Configure the command to run in its own process group
+    // This MUST be done before spawning the command.
+    // Take ownership to modify, then pass the modified command to spawn_command_and_setup_state
+    let mut std_cmd = std::mem::replace(&mut command, StdCommand::new("")); // Take ownership temporarily
     unsafe {
-        command.pre_exec(|| {
+        std_cmd.pre_exec(|| {
             // libc::setpgid(0, 0) makes the new process its own group leader.
             // Pass 0 for both pid and pgid to achieve this for the calling process.
             if libc::setpgid(0, 0) == 0 {
@@ -499,11 +504,11 @@ pub async fn run_command_with_timeout(
             }
         });
     }
-    
-    
+    // Put the modified command back for spawning
+    command = std_cmd;
 
     // Setup state (spawns command with pre_exec hook)
-    let mut state = spawn_command_and_setup_state(command, initial_deadline)?;
+    let mut state = spawn_command_and_setup_state(&mut command, initial_deadline)?;
 
     // Main execution loop
     run_command_loop(&mut state, &timeout_config).await?;
@@ -516,22 +521,22 @@ pub async fn run_command_with_timeout(
         &mut state.stdout_read_buffer,
         "stdout",
     )
-    .await?;
+        .await?;
     drain_reader(
         &mut state.stderr_reader,
         &mut state.stderr_buffer,
         &mut state.stderr_read_buffer,
         "stderr",
     )
-    .await?;
+        .await?;
 
     // Post-loop processing: Final wait if killed and status not yet obtained
     let final_exit_status = finalize_exit_status(
         &mut state.child,
         state.exit_status, // Use status potentially set in loop
         state.timed_out,
     )
-    .await?;
+        .await?;
 
     let end_time = Instant::now();
     let duration = end_time.duration_since(start_time);
@@ -849,7 +854,7 @@ mod tests {
     fn test_min_timeout_greater_than_max_timeout() {
         run_async_test(|| async {
             let cmd = StdCommand::new("echo"); // removed mut
-                                               // cmd.arg("test"); // Don't need args
+            // cmd.arg("test"); // Don't need args
 
             let min_timeout = Duration::from_secs(2);
             let max_timeout = Duration::from_secs(1); // Invalid config
@@ -870,7 +875,7 @@ mod tests {
     fn test_zero_activity_timeout() {
         run_async_test(|| async {
             let cmd = StdCommand::new("echo"); // removed mut
-                                               // cmd.arg("test"); // Don't need args
+            // cmd.arg("test"); // Don't need args
 
             let min_timeout = Duration::from_millis(100);
             let max_timeout = Duration::from_secs(1);
@@ -988,4 +993,4 @@ mod tests {
             );
         });
     }
-} // end tests mod
+} // end tests mod