openai/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-09-15 12:08:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix shell timeout test in RBE

Browse Source
This commit is contained in:
David Zbarsky
2026-01-07 20:54:06 -05:00
parent f6b563ec64
commit 5ea9675f78
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
codex-rs/core/src/shell_snapshot.rs
View File

@@ -252,11 +252,11 @@ $envVars | ForEach-Object {
#[cfg(test)]
mod tests {
use super::*;
#[cfg(target_os = "linux")]
use libc;
use pretty_assertions::assert_eq;
#[cfg(target_os = "linux")]
use std::os::unix::fs::PermissionsExt;
#[cfg(target_os = "linux")]
use std::process::Command as StdCommand;
use tempfile::tempdir;
@@ -319,7 +319,6 @@ mod tests {
#[cfg(target_os = "linux")]
#[tokio::test]
async fn timed_out_snapshot_shell_is_terminated() -> Result<()> {
use std::process::Stdio;
use tokio::time::Duration as TokioDuration;
use tokio::time::Instant;
use tokio::time::sleep;
@@ -361,13 +360,17 @@ mod tests {
let deadline = Instant::now() + TokioDuration::from_secs(1);
loop {
let kill_status = StdCommand::new("kill")
.arg("-0")
.arg(pid.to_string())
.stderr(Stdio::null())
.stdout(Stdio::null())
.status()?;
if !kill_status.success() {
let alive = unsafe { libc::kill(pid, 0) };
if alive != 0 {
let err = std::io::Error::last_os_error();
let raw = err.raw_os_error();
if raw == Some(libc::ESRCH) {
break;
}
if raw != Some(libc::EPERM) {
return Err(err.into());
}
} else {
break;
}
if Instant::now() >= deadline {