mirror of
https://github.com/openai/codex.git
synced 2026-02-01 22:47:52 +00:00
To support Bazelification in https://github.com/openai/codex/pull/8875, this PR introduces a new `find_resource!` macro that we use in place of our existing logic in tests that looks for resources relative to the compile-time `CARGO_MANIFEST_DIR` env var. To make this work, we plan to add the following to all `rust_library()` and `rust_test()` Bazel rules in the project: ``` rustc_env = { "BAZEL_PACKAGE": native.package_name(), }, ``` Our new `find_resource!` macro reads this value via `option_env!("BAZEL_PACKAGE")` so that the Bazel package _of the code using `find_resource!`_ is injected into the code expanded from the macro. (If `find_resource()` were a function, then `option_env!("BAZEL_PACKAGE")` would always be `codex-rs/utils/cargo-bin`, which is not what we want.) Note we only consider the `BAZEL_PACKAGE` value when the `RUNFILES_DIR` environment variable is set at runtime, indicating that the test is being run by Bazel. In this case, we have to concatenate the runtime `RUNFILES_DIR` with the compile-time `BAZEL_PACKAGE` value to build the path to the resource. In testing this change, I discovered one funky edge case in `codex-rs/exec-server/tests/common/lib.rs` where we have to _normalize_ (but not canonicalize!) the result from `find_resource!` because the path contains a `common/..` component that does not exist on disk when the test is run under Bazel, so it must be semantically normalized using the [`path-absolutize`](https://crates.io/crates/path-absolutize) crate before it is passed to `dotslash fetch`. Because this new behavior may be non-obvious, this PR also updates `AGENTS.md` to make humans/Codex aware that this API is preferred.
189 lines
5.6 KiB
Rust
189 lines
5.6 KiB
Rust
use codex_chatgpt::apply_command::apply_diff_from_task;
|
|
use codex_chatgpt::get_task::GetTaskResponse;
|
|
use codex_utils_cargo_bin::find_resource;
|
|
use tempfile::TempDir;
|
|
use tokio::process::Command;
|
|
|
|
/// Creates a temporary git repository with initial commit
|
|
async fn create_temp_git_repo() -> anyhow::Result<TempDir> {
|
|
let temp_dir = TempDir::new()?;
|
|
let repo_path = temp_dir.path();
|
|
let envs = vec![
|
|
("GIT_CONFIG_GLOBAL", "/dev/null"),
|
|
("GIT_CONFIG_NOSYSTEM", "1"),
|
|
];
|
|
|
|
let output = Command::new("git")
|
|
.envs(envs.clone())
|
|
.args(["init"])
|
|
.current_dir(repo_path)
|
|
.output()
|
|
.await?;
|
|
|
|
if !output.status.success() {
|
|
anyhow::bail!(
|
|
"Failed to initialize git repo: {}",
|
|
String::from_utf8_lossy(&output.stderr)
|
|
);
|
|
}
|
|
|
|
Command::new("git")
|
|
.envs(envs.clone())
|
|
.args(["config", "user.email", "test@example.com"])
|
|
.current_dir(repo_path)
|
|
.output()
|
|
.await?;
|
|
|
|
Command::new("git")
|
|
.envs(envs.clone())
|
|
.args(["config", "user.name", "Test User"])
|
|
.current_dir(repo_path)
|
|
.output()
|
|
.await?;
|
|
|
|
std::fs::write(repo_path.join("README.md"), "# Test Repo\n")?;
|
|
|
|
Command::new("git")
|
|
.envs(envs.clone())
|
|
.args(["add", "README.md"])
|
|
.current_dir(repo_path)
|
|
.output()
|
|
.await?;
|
|
|
|
let output = Command::new("git")
|
|
.envs(envs.clone())
|
|
.args(["commit", "-m", "Initial commit"])
|
|
.current_dir(repo_path)
|
|
.output()
|
|
.await?;
|
|
|
|
if !output.status.success() {
|
|
anyhow::bail!(
|
|
"Failed to create initial commit: {}",
|
|
String::from_utf8_lossy(&output.stderr)
|
|
);
|
|
}
|
|
|
|
Ok(temp_dir)
|
|
}
|
|
|
|
async fn mock_get_task_with_fixture() -> anyhow::Result<GetTaskResponse> {
|
|
let fixture_path = find_resource!("tests/task_turn_fixture.json")?;
|
|
let fixture_content = tokio::fs::read_to_string(fixture_path).await?;
|
|
let response: GetTaskResponse = serde_json::from_str(&fixture_content)?;
|
|
Ok(response)
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn test_apply_command_creates_fibonacci_file() {
|
|
let temp_repo = create_temp_git_repo()
|
|
.await
|
|
.expect("Failed to create temp git repo");
|
|
let repo_path = temp_repo.path();
|
|
|
|
let task_response = mock_get_task_with_fixture()
|
|
.await
|
|
.expect("Failed to load fixture");
|
|
|
|
apply_diff_from_task(task_response, Some(repo_path.to_path_buf()))
|
|
.await
|
|
.expect("Failed to apply diff from task");
|
|
|
|
// Assert that fibonacci.js was created in scripts/ directory
|
|
let fibonacci_path = repo_path.join("scripts/fibonacci.js");
|
|
assert!(fibonacci_path.exists(), "fibonacci.js was not created");
|
|
|
|
// Verify the file contents match expected
|
|
let contents = std::fs::read_to_string(&fibonacci_path).expect("Failed to read fibonacci.js");
|
|
assert!(
|
|
contents.contains("function fibonacci(n)"),
|
|
"fibonacci.js doesn't contain expected function"
|
|
);
|
|
assert!(
|
|
contents.contains("#!/usr/bin/env node"),
|
|
"fibonacci.js doesn't have shebang"
|
|
);
|
|
assert!(
|
|
contents.contains("module.exports = fibonacci;"),
|
|
"fibonacci.js doesn't export function"
|
|
);
|
|
|
|
// Verify file has correct number of lines (31 as specified in fixture)
|
|
let line_count = contents.lines().count();
|
|
assert_eq!(
|
|
line_count, 31,
|
|
"fibonacci.js should have 31 lines, got {line_count}",
|
|
);
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn test_apply_command_with_merge_conflicts() {
|
|
let temp_repo = create_temp_git_repo()
|
|
.await
|
|
.expect("Failed to create temp git repo");
|
|
let repo_path = temp_repo.path();
|
|
|
|
// Create conflicting fibonacci.js file first
|
|
let scripts_dir = repo_path.join("scripts");
|
|
std::fs::create_dir_all(&scripts_dir).expect("Failed to create scripts directory");
|
|
|
|
let conflicting_content = r#"#!/usr/bin/env node
|
|
|
|
// This is a different fibonacci implementation
|
|
function fib(num) {
|
|
if (num <= 1) return num;
|
|
return fib(num - 1) + fib(num - 2);
|
|
}
|
|
|
|
console.log("Running fibonacci...");
|
|
console.log(fib(10));
|
|
"#;
|
|
|
|
let fibonacci_path = scripts_dir.join("fibonacci.js");
|
|
std::fs::write(&fibonacci_path, conflicting_content).expect("Failed to write conflicting file");
|
|
|
|
Command::new("git")
|
|
.args(["add", "scripts/fibonacci.js"])
|
|
.current_dir(repo_path)
|
|
.output()
|
|
.await
|
|
.expect("Failed to add fibonacci.js");
|
|
|
|
Command::new("git")
|
|
.args(["commit", "-m", "Add conflicting fibonacci implementation"])
|
|
.current_dir(repo_path)
|
|
.output()
|
|
.await
|
|
.expect("Failed to commit conflicting file");
|
|
|
|
let original_dir = std::env::current_dir().expect("Failed to get current dir");
|
|
std::env::set_current_dir(repo_path).expect("Failed to change directory");
|
|
struct DirGuard(std::path::PathBuf);
|
|
impl Drop for DirGuard {
|
|
fn drop(&mut self) {
|
|
let _ = std::env::set_current_dir(&self.0);
|
|
}
|
|
}
|
|
let _guard = DirGuard(original_dir);
|
|
|
|
let task_response = mock_get_task_with_fixture()
|
|
.await
|
|
.expect("Failed to load fixture");
|
|
|
|
let apply_result = apply_diff_from_task(task_response, Some(repo_path.to_path_buf())).await;
|
|
|
|
assert!(
|
|
apply_result.is_err(),
|
|
"Expected apply to fail due to merge conflicts"
|
|
);
|
|
|
|
let contents = std::fs::read_to_string(&fibonacci_path).expect("Failed to read fibonacci.js");
|
|
|
|
assert!(
|
|
contents.contains("<<<<<<< HEAD")
|
|
|| contents.contains("=======")
|
|
|| contents.contains(">>>>>>> "),
|
|
"fibonacci.js should contain merge conflict markers, got: {contents}",
|
|
);
|
|
}
|