timeout: return timed-out status after kill grace period (#11392)

can1357 · sylvestre · web-flow · commit dd2bcea76ddf · 2026-04-03T11:06:43.000+02:00
Co-authored-by: Sylvestre Ledru &lt;sylvestre@debian.org&gt;
diff --git a/src/uu/timeout/src/timeout.rs b/src/uu/timeout/src/timeout.rs
@@ -296,7 +296,7 @@ fn wait_or_kill_process(
                 });
                 Ok(exit_code)
             } else {
-                Ok(ExitStatus::TimeoutFailed.into())
+                Ok(ExitStatus::CommandTimedOut.into())
             }
         }
         Ok(None) => {
diff --git a/tests/by-util/test_timeout.rs b/tests/by-util/test_timeout.rs
@@ -104,6 +104,13 @@ fn test_preserve_status() {
     }
 }
 
+#[test]
+fn test_kill_after_preserves_timeout_exit_without_preserve_status() {
+    new_ucmd!()
+        .args(&["-k", "1", "1", "sleep", "10"])
+        .fails_with_code(124)
+        .no_output();
+}
 #[test]
 fn test_preserve_status_even_when_send_signal() {
     // When sending CONT signal, process doesn't get killed or stopped.

Original file line number	Diff line number	Diff line change
`@@ -296,7 +296,7 @@ fn wait_or_kill_process(`
`296`	`296`	`});`
`297`	`297`	`Ok(exit_code)`
`298`	`298`	`} else {`
`299`		`- Ok(ExitStatus::TimeoutFailed.into())`
	`299`	`+ Ok(ExitStatus::CommandTimedOut.into())`
`300`	`300`	`}`
`301`	`301`	`}`
`302`	`302`	`Ok(None) => {`
Original file line number	Diff line number	Diff line change
`@@ -104,6 +104,13 @@ fn test_preserve_status() {`
`104`	`104`	`}`
`105`	`105`	`}`
`106`	`106`
	`107`	`+#[test]`
	`108`	`+fn test_kill_after_preserves_timeout_exit_without_preserve_status() {`
	`109`	`+ new_ucmd!()`
	`110`	`+ .args(&["-k", "1", "1", "sleep", "10"])`
	`111`	`+ .fails_with_code(124)`
	`112`	`+ .no_output();`
	`113`	`+}`
`107`	`114`	`#[test]`
`108`	`115`	`fn test_preserve_status_even_when_send_signal() {`
`109`	`116`	`// When sending CONT signal, process doesn't get killed or stopped.`