mirror of
https://github.com/openai/codex.git
synced 2026-11-12 21:20:34 +00:00
## Why Tests need to distinguish slow subprocess startup from operation timeouts and wait for asynchronous work before asserting results or cleaning up fixtures. ## What changed - Synchronize subprocess readiness, queued-turn completion, and matching UI events; allow more time for cold startup and separate startup from shutdown deadlines. - Adapt Windows fixtures and permission expectations, provide the voice-host test runtime DLL path, and normalize platform paths and animated status snapshots. - Use current configuration permissions when changing directories in embedded TUI sessions, while retaining saved permissions for remote sessions. - Allow the release prompt-prefix comparison to accept the exact image-tool description update that removes image detail options, and refresh the corresponding tool snapshot. ## Testing Extend inherited-session metadata coverage to both legacy and paginated thread history, including persisted history mode and revision-aware resume. GitOrigin-RevId: 0afb38403fc0adb0d83175344749584f0cdf9979
156 lines
5.4 KiB
Rust
156 lines
5.4 KiB
Rust
use super::spawn_git_command;
|
|
use super::wait_for_git_command_with_timeout_output;
|
|
use pretty_assertions::assert_eq;
|
|
#[cfg(windows)]
|
|
use std::process::Stdio;
|
|
use std::time::Duration;
|
|
use tokio::process::Command;
|
|
|
|
#[derive(Clone, Copy)]
|
|
enum GitWrapperLifetime {
|
|
WaitForChild,
|
|
ExitBeforeTimeout,
|
|
}
|
|
|
|
async fn assert_timed_out_git_wrapper_does_not_leave_child_process_running(
|
|
wrapper_lifetime: GitWrapperLifetime,
|
|
) {
|
|
let temp_dir = tempfile::tempdir().expect("create temp dir");
|
|
let child_pid_file = temp_dir.path().join("child.pid");
|
|
let child_ready_file = temp_dir.path().join("child-ready");
|
|
let release_child_file = temp_dir.path().join("release-child");
|
|
let child_survived_file = temp_dir.path().join("child-survived");
|
|
let release_wrapper_file = temp_dir.path().join("release-wrapper");
|
|
#[cfg(unix)]
|
|
let mut command = {
|
|
let mut command = Command::new("/bin/sh");
|
|
let wrapper_command = match wrapper_lifetime {
|
|
GitWrapperLifetime::WaitForChild => {
|
|
r#"( : > "$CHILD_READY_FILE"; while [ ! -f "$RELEASE_CHILD_FILE" ]; do sleep 0.01; done; sleep 1; : > "$CHILD_SURVIVED_FILE"; sleep 60 ) & child_pid=$!; printf '%s\n' "$child_pid" > "$CHILD_PID_FILE"; wait "$child_pid""#
|
|
}
|
|
GitWrapperLifetime::ExitBeforeTimeout => {
|
|
r#"( : > "$CHILD_READY_FILE"; while [ ! -f "$RELEASE_CHILD_FILE" ]; do sleep 0.01; done; sleep 1; : > "$CHILD_SURVIVED_FILE"; sleep 60 ) & child_pid=$!; printf '%s\n' "$child_pid" > "$CHILD_PID_FILE"; while [ ! -f "$RELEASE_WRAPPER_FILE" ]; do sleep 0.01; done"#
|
|
}
|
|
};
|
|
command.args(["-c", wrapper_command]);
|
|
command
|
|
};
|
|
#[cfg(windows)]
|
|
let mut command = {
|
|
let script = temp_dir.path().join("git_wrapper.py");
|
|
std::fs::write(
|
|
&script,
|
|
r#"import os
|
|
from pathlib import Path
|
|
import subprocess
|
|
import sys
|
|
import time
|
|
|
|
def wait_for(name):
|
|
while not Path(os.environ[name]).exists():
|
|
time.sleep(0.025)
|
|
|
|
if sys.argv[1] == "child":
|
|
Path(os.environ["CHILD_READY_FILE"]).touch()
|
|
wait_for("RELEASE_CHILD_FILE")
|
|
time.sleep(1)
|
|
Path(os.environ["CHILD_SURVIVED_FILE"]).touch()
|
|
time.sleep(60)
|
|
else:
|
|
child = subprocess.Popen([sys.executable, __file__, "child"])
|
|
Path(os.environ["CHILD_PID_FILE"]).write_text(str(child.pid))
|
|
if sys.argv[1] == "wait":
|
|
child.wait()
|
|
else:
|
|
wait_for("RELEASE_WRAPPER_FILE")
|
|
"#,
|
|
)
|
|
.expect("write Git wrapper fixture");
|
|
let mut command = Command::new("python.exe");
|
|
command.arg(script).arg(match wrapper_lifetime {
|
|
GitWrapperLifetime::WaitForChild => "wait",
|
|
GitWrapperLifetime::ExitBeforeTimeout => "exit",
|
|
});
|
|
command
|
|
};
|
|
command
|
|
.env("CHILD_PID_FILE", &child_pid_file)
|
|
.env("CHILD_READY_FILE", &child_ready_file)
|
|
.env("RELEASE_CHILD_FILE", &release_child_file)
|
|
.env("CHILD_SURVIVED_FILE", &child_survived_file)
|
|
.env("RELEASE_WRAPPER_FILE", &release_wrapper_file);
|
|
|
|
let (mut wrapper, process_tree) = spawn_git_command(&mut command).expect("spawn Git wrapper");
|
|
let child_pid = tokio::time::timeout(Duration::from_secs(30), async {
|
|
loop {
|
|
if let Ok(child_pid) = std::fs::read_to_string(&child_pid_file)
|
|
&& !child_pid.trim().is_empty()
|
|
&& child_ready_file.exists()
|
|
{
|
|
break child_pid.trim().to_string();
|
|
}
|
|
tokio::time::sleep(Duration::from_millis(25)).await;
|
|
}
|
|
})
|
|
.await
|
|
.expect("wait for Git wrapper child readiness");
|
|
|
|
if matches!(wrapper_lifetime, GitWrapperLifetime::ExitBeforeTimeout) {
|
|
std::fs::write(&release_wrapper_file, "release").expect("release Git wrapper");
|
|
tokio::time::timeout(Duration::from_secs(10), async {
|
|
loop {
|
|
if wrapper
|
|
.try_wait()
|
|
.expect("check Git wrapper state")
|
|
.is_some()
|
|
{
|
|
break;
|
|
}
|
|
tokio::time::sleep(Duration::from_millis(25)).await;
|
|
}
|
|
})
|
|
.await
|
|
.expect("wait for Git wrapper exit");
|
|
}
|
|
|
|
let output =
|
|
wait_for_git_command_with_timeout_output(wrapper, process_tree, Duration::from_millis(100))
|
|
.await;
|
|
assert_eq!(output, None);
|
|
|
|
std::fs::write(&release_child_file, "release").expect("release Git wrapper child");
|
|
tokio::time::sleep(Duration::from_secs(3)).await;
|
|
if !child_survived_file.exists() {
|
|
return;
|
|
}
|
|
|
|
#[cfg(unix)]
|
|
let _ = std::process::Command::new("kill")
|
|
.args(["-KILL", &child_pid])
|
|
.status();
|
|
#[cfg(windows)]
|
|
let _ = std::process::Command::new("taskkill")
|
|
.args(["/PID", &child_pid, "/T", "/F"])
|
|
.stdin(Stdio::null())
|
|
.stdout(Stdio::null())
|
|
.stderr(Stdio::null())
|
|
.status();
|
|
panic!("Git wrapper child process {child_pid} survived timeout cleanup");
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn timed_out_git_wrapper_does_not_leave_child_process_running() {
|
|
assert_timed_out_git_wrapper_does_not_leave_child_process_running(
|
|
GitWrapperLifetime::WaitForChild,
|
|
)
|
|
.await;
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn timed_out_exited_git_wrapper_does_not_leave_child_process_running() {
|
|
assert_timed_out_git_wrapper_does_not_leave_child_process_running(
|
|
GitWrapperLifetime::ExitBeforeTimeout,
|
|
)
|
|
.await;
|
|
}
|