mirror of
https://github.com/openai/codex.git
synced 2026-04-26 15:45:02 +00:00
e61bae12e3
This PR introduces a `codex-utils-cargo-bin` utility crate that wraps/replaces our use of `assert_cmd::Command` and `escargot::CargoBuild`. As you can infer from the introduction of `buck_project_root()` in this PR, I am attempting to make it possible to build Codex under [Buck2](https://buck2.build) as well as `cargo`. With Buck2, I hope to achieve faster incremental local builds (largely due to Buck2's [dice](https://buck2.build/docs/insights_and_knowledge/modern_dice/) build strategy, as well as benefits from its local build daemon) as well as faster CI builds if we invest in remote execution and caching. See https://buck2.build/docs/getting_started/what_is_buck2/#why-use-buck2-key-advantages for more details about the performance advantages of Buck2. Buck2 enforces stronger requirements in terms of build and test isolation. It discourages assumptions about absolute paths (which is key to enabling remote execution). Because the `CARGO_BIN_EXE_*` environment variables that Cargo provides are absolute paths (which `assert_cmd::Command` reads), this is a problem for Buck2, which is why we need this `codex-utils-cargo-bin` utility. My WIP-Buck2 setup sets the `CARGO_BIN_EXE_*` environment variables passed to a `rust_test()` build rule as relative paths. `codex-utils-cargo-bin` will resolve these values to absolute paths, when necessary. --- [//]: # (BEGIN SAPLING FOOTER) Stack created with [Sapling](https://sapling-scm.com). Best reviewed with [ReviewStack](https://reviewstack.dev/openai/codex/pull/8496). * #8498 * __->__ #8496
69 lines
2.0 KiB
Rust
69 lines
2.0 KiB
Rust
use std::io::ErrorKind;
|
|
use std::io::Read;
|
|
use std::io::Write;
|
|
use std::sync::mpsc;
|
|
use std::thread;
|
|
use std::time::Duration;
|
|
|
|
use anyhow::Context;
|
|
use assert_cmd::Command;
|
|
use pretty_assertions::assert_eq;
|
|
|
|
#[cfg(unix)]
|
|
use std::os::unix::net::UnixListener;
|
|
|
|
#[cfg(windows)]
|
|
use uds_windows::UnixListener;
|
|
|
|
#[test]
|
|
fn pipes_stdin_and_stdout_through_socket() -> anyhow::Result<()> {
|
|
let dir = tempfile::TempDir::new().context("failed to create temp dir")?;
|
|
let socket_path = dir.path().join("socket");
|
|
let listener = match UnixListener::bind(&socket_path) {
|
|
Ok(listener) => listener,
|
|
Err(err) if err.kind() == ErrorKind::PermissionDenied => {
|
|
eprintln!("skipping test: failed to bind unix socket: {err}");
|
|
return Ok(());
|
|
}
|
|
Err(err) => {
|
|
return Err(err).context("failed to bind test unix socket");
|
|
}
|
|
};
|
|
|
|
let (tx, rx) = mpsc::channel();
|
|
let server_thread = thread::spawn(move || -> anyhow::Result<()> {
|
|
let (mut connection, _) = listener
|
|
.accept()
|
|
.context("failed to accept test connection")?;
|
|
let mut received = Vec::new();
|
|
connection
|
|
.read_to_end(&mut received)
|
|
.context("failed to read data from client")?;
|
|
tx.send(received)
|
|
.map_err(|_| anyhow::anyhow!("failed to send received bytes to test thread"))?;
|
|
connection
|
|
.write_all(b"response")
|
|
.context("failed to write response to client")?;
|
|
Ok(())
|
|
});
|
|
|
|
Command::new(codex_utils_cargo_bin::cargo_bin("codex-stdio-to-uds")?)
|
|
.arg(&socket_path)
|
|
.write_stdin("request")
|
|
.assert()
|
|
.success()
|
|
.stdout("response");
|
|
|
|
let received = rx
|
|
.recv_timeout(Duration::from_secs(1))
|
|
.context("server did not receive data in time")?;
|
|
assert_eq!(received, b"request");
|
|
|
|
let server_result = server_thread
|
|
.join()
|
|
.map_err(|_| anyhow::anyhow!("server thread panicked"))?;
|
|
server_result.context("server failed")?;
|
|
|
|
Ok(())
|
|
}
|