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
91 lines
2.2 KiB
Rust
91 lines
2.2 KiB
Rust
use assert_cmd::Command;
|
|
use std::fs;
|
|
use tempfile::tempdir;
|
|
|
|
fn apply_patch_command() -> anyhow::Result<Command> {
|
|
Ok(Command::new(codex_utils_cargo_bin::cargo_bin(
|
|
"apply_patch",
|
|
)?))
|
|
}
|
|
|
|
#[test]
|
|
fn test_apply_patch_cli_add_and_update() -> anyhow::Result<()> {
|
|
let tmp = tempdir()?;
|
|
let file = "cli_test.txt";
|
|
let absolute_path = tmp.path().join(file);
|
|
|
|
// 1) Add a file
|
|
let add_patch = format!(
|
|
r#"*** Begin Patch
|
|
*** Add File: {file}
|
|
+hello
|
|
*** End Patch"#
|
|
);
|
|
apply_patch_command()?
|
|
.arg(add_patch)
|
|
.current_dir(tmp.path())
|
|
.assert()
|
|
.success()
|
|
.stdout(format!("Success. Updated the following files:\nA {file}\n"));
|
|
assert_eq!(fs::read_to_string(&absolute_path)?, "hello\n");
|
|
|
|
// 2) Update the file
|
|
let update_patch = format!(
|
|
r#"*** Begin Patch
|
|
*** Update File: {file}
|
|
@@
|
|
-hello
|
|
+world
|
|
*** End Patch"#
|
|
);
|
|
apply_patch_command()?
|
|
.arg(update_patch)
|
|
.current_dir(tmp.path())
|
|
.assert()
|
|
.success()
|
|
.stdout(format!("Success. Updated the following files:\nM {file}\n"));
|
|
assert_eq!(fs::read_to_string(&absolute_path)?, "world\n");
|
|
|
|
Ok(())
|
|
}
|
|
|
|
#[test]
|
|
fn test_apply_patch_cli_stdin_add_and_update() -> anyhow::Result<()> {
|
|
let tmp = tempdir()?;
|
|
let file = "cli_test_stdin.txt";
|
|
let absolute_path = tmp.path().join(file);
|
|
|
|
// 1) Add a file via stdin
|
|
let add_patch = format!(
|
|
r#"*** Begin Patch
|
|
*** Add File: {file}
|
|
+hello
|
|
*** End Patch"#
|
|
);
|
|
apply_patch_command()?
|
|
.current_dir(tmp.path())
|
|
.write_stdin(add_patch)
|
|
.assert()
|
|
.success()
|
|
.stdout(format!("Success. Updated the following files:\nA {file}\n"));
|
|
assert_eq!(fs::read_to_string(&absolute_path)?, "hello\n");
|
|
|
|
// 2) Update the file via stdin
|
|
let update_patch = format!(
|
|
r#"*** Begin Patch
|
|
*** Update File: {file}
|
|
@@
|
|
-hello
|
|
+world
|
|
*** End Patch"#
|
|
);
|
|
apply_patch_command()?
|
|
.current_dir(tmp.path())
|
|
.write_stdin(update_patch)
|
|
.assert()
|
|
.success()
|
|
.stdout(format!("Success. Updated the following files:\nM {file}\n"));
|
|
assert_eq!(fs::read_to_string(&absolute_path)?, "world\n");
|
|
|
|
Ok(())
|
|
}
|