mirror of
https://github.com/openai/codex.git
synced 2026-04-30 17:36:40 +00:00
3d4ced3ff5
https://github.com/openai/codex/pull/8235 introduced `ConfigBuilder` and this PR updates all call non-test call sites to use it instead of `Config::load_from_base_config_with_overrides()`. This is important because `load_from_base_config_with_overrides()` uses an empty `ConfigRequirements`, which is a reasonable default for testing so the tests are not influenced by the settings on the host. This method is now guarded by `#[cfg(test)]` so it cannot be used by business logic. Because `ConfigBuilder::build()` is `async`, many of the test methods had to be migrated to be `async`, as well. On the bright side, this made it possible to eliminate a bunch of `block_on_future()` stuff.
97 lines
3.1 KiB
Rust
97 lines
3.1 KiB
Rust
use codex_core::CodexAuth;
|
|
use codex_core::ConversationManager;
|
|
use codex_core::protocol::EventMsg;
|
|
use codex_core::protocol::Op;
|
|
use codex_protocol::openai_models::ReasoningEffort;
|
|
use core_test_support::load_default_config_for_test;
|
|
use core_test_support::wait_for_event;
|
|
use pretty_assertions::assert_eq;
|
|
use tempfile::TempDir;
|
|
|
|
const CONFIG_TOML: &str = "config.toml";
|
|
|
|
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
|
|
async fn override_turn_context_does_not_persist_when_config_exists() {
|
|
let codex_home = TempDir::new().unwrap();
|
|
let config_path = codex_home.path().join(CONFIG_TOML);
|
|
let initial_contents = "model = \"gpt-4o\"\n";
|
|
tokio::fs::write(&config_path, initial_contents)
|
|
.await
|
|
.expect("seed config.toml");
|
|
|
|
let mut config = load_default_config_for_test(&codex_home).await;
|
|
config.model = Some("gpt-4o".to_string());
|
|
|
|
let conversation_manager = ConversationManager::with_models_provider(
|
|
CodexAuth::from_api_key("Test API Key"),
|
|
config.model_provider.clone(),
|
|
);
|
|
let codex = conversation_manager
|
|
.new_conversation(config)
|
|
.await
|
|
.expect("create conversation")
|
|
.conversation;
|
|
|
|
codex
|
|
.submit(Op::OverrideTurnContext {
|
|
cwd: None,
|
|
approval_policy: None,
|
|
sandbox_policy: None,
|
|
model: Some("o3".to_string()),
|
|
effort: Some(Some(ReasoningEffort::High)),
|
|
summary: None,
|
|
})
|
|
.await
|
|
.expect("submit override");
|
|
|
|
codex.submit(Op::Shutdown).await.expect("request shutdown");
|
|
wait_for_event(&codex, |ev| matches!(ev, EventMsg::ShutdownComplete)).await;
|
|
|
|
let contents = tokio::fs::read_to_string(&config_path)
|
|
.await
|
|
.expect("read config.toml after override");
|
|
assert_eq!(contents, initial_contents);
|
|
}
|
|
|
|
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
|
|
async fn override_turn_context_does_not_create_config_file() {
|
|
let codex_home = TempDir::new().unwrap();
|
|
let config_path = codex_home.path().join(CONFIG_TOML);
|
|
assert!(
|
|
!config_path.exists(),
|
|
"test setup should start without config"
|
|
);
|
|
|
|
let config = load_default_config_for_test(&codex_home).await;
|
|
|
|
let conversation_manager = ConversationManager::with_models_provider(
|
|
CodexAuth::from_api_key("Test API Key"),
|
|
config.model_provider.clone(),
|
|
);
|
|
let codex = conversation_manager
|
|
.new_conversation(config)
|
|
.await
|
|
.expect("create conversation")
|
|
.conversation;
|
|
|
|
codex
|
|
.submit(Op::OverrideTurnContext {
|
|
cwd: None,
|
|
approval_policy: None,
|
|
sandbox_policy: None,
|
|
model: Some("o3".to_string()),
|
|
effort: Some(Some(ReasoningEffort::Medium)),
|
|
summary: None,
|
|
})
|
|
.await
|
|
.expect("submit override");
|
|
|
|
codex.submit(Op::Shutdown).await.expect("request shutdown");
|
|
wait_for_event(&codex, |ev| matches!(ev, EventMsg::ShutdownComplete)).await;
|
|
|
|
assert!(
|
|
!config_path.exists(),
|
|
"override should not create config.toml"
|
|
);
|
|
}
|