From 84d8077c5436f7b8e6dbccb83d88220eb150fa70 Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Wed, 9 Jul 2025 15:37:43 +0200
Subject: [PATCH] Various improvements to the passwd_timeout tests

* Fix "token exceeds maximum length" by rounding the division result
* Assert exit code / kill signal to ensure the process exited for the
  right reason.
* Fail the zero_time_out test when sudo crashed with a signal before we
  kill it.
---
 .../src/sudo/sudoers/passwd_timeout.rs        | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/test-framework/sudo-compliance-tests/src/sudo/sudoers/passwd_timeout.rs b/test-framework/sudo-compliance-tests/src/sudo/sudoers/passwd_timeout.rs
index 53987affe..c5f141c1b 100644
--- a/test-framework/sudo-compliance-tests/src/sudo/sudoers/passwd_timeout.rs
+++ b/test-framework/sudo-compliance-tests/src/sudo/sudoers/passwd_timeout.rs
@@ -1,3 +1,4 @@
+use std::os::unix::process::ExitStatusExt;
 use std::thread;
 use std::time::Duration;
 
@@ -13,7 +14,7 @@ fn time_out() -> Result<()> {
     let script_path = "/tmp/passwd_timeout.sh";
 
     let env = Env(format!(
-        "{USERNAME} ALL=(ALL:ALL) ALL\nDefaults passwd_timeout={}",
+        "{USERNAME} ALL=(ALL:ALL) ALL\nDefaults passwd_timeout={:04}",
         timeout_seconds as f64 / 60.0,
     ))
     .user(User(USERNAME).password(PASSWORD))
@@ -40,6 +41,7 @@ fn time_out() -> Result<()> {
     }
 
     let output = child.wait();
+    output.assert_exit_code(1);
     let diagnostic = if sudo_test::is_original_sudo() {
         "timed out reading password"
     } else {
@@ -57,7 +59,7 @@ fn dont_time_out() -> Result<()> {
     let script_path = "/tmp/passwd_timeout.sh";
 
     let env = Env(format!(
-        "{USERNAME} ALL=(ALL:ALL) ALL\nDefaults passwd_timeout={}",
+        "{USERNAME} ALL=(ALL:ALL) ALL\nDefaults passwd_timeout={:04}",
         timeout_seconds as f64 / 60.0,
     ))
     .user(User(USERNAME).password(PASSWORD))
@@ -73,7 +75,8 @@ fn dont_time_out() -> Result<()> {
 
     child.kill()?;
 
-    let output = dbg!(child.wait());
+    let output = child.wait();
+    assert_eq!(output.status().signal(), Some(9 /* SIGKILL */));
     assert_not_contains!(output.stderr(), "timed out");
     Ok(())
 }
@@ -101,16 +104,14 @@ fn zero_time_out() -> Result<()> {
         None => {
             child.kill()?;
         }
-        Some(status) => {
-            if let Some(code) = status.code() {
-                println!("passwd_timeout=0 exited: {code:?}");
-                println!("{:?}", child.wait());
-                panic!();
-            }
+        Some(_status) => {
+            println!("exited with {:?}", child.wait());
+            panic!();
         }
     }
 
     let output = child.wait();
+    assert_eq!(output.status().signal(), Some(9 /* SIGKILL */));
     assert_not_contains!(output.stderr(), "timed out");
     Ok(())
 }