clone/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-04-24 06:35:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

codex: isolate core tests on PR #16274

Browse Source
This commit is contained in:
Eric Traut
2026-03-30 15:32:45 -06:00
parent a203d9df57
commit 7b6b29e968
2 changed files with 47 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
codex-rs/core/src/config/config_tests.rs
View File

@@ -84,6 +84,29 @@ fn http_mcp(url: &str) -> McpServerConfig {
}
}
async fn load_isolated_config_from_home(codex_home: &TempDir) -> std::io::Result<Config> {
let config_path = codex_home.path().join(CONFIG_TOML_FILE);
let config_toml = match tokio::fs::read_to_string(&config_path).await {
Ok(contents) => {
let value = toml::from_str(&contents)
.map_err(|err| std::io::Error::new(std::io::ErrorKind::InvalidData, err))?;
deserialize_config_toml_with_base(value, codex_home.path())?
}
Err(err) if err.kind() == std::io::ErrorKind::NotFound => ConfigToml::default(),
Err(err) => return Err(err),
};
Config::load_config_with_layer_stack(
config_toml,
ConfigOverrides {
cwd: Some(codex_home.path().to_path_buf()),
..Default::default()
},
codex_home.path().to_path_buf(),
ConfigLayerStack::default(),
)
}
#[test]
fn load_config_normalizes_relative_cwd_override() -> std::io::Result<()> {
let expected_cwd = AbsolutePathBuf::relative_to_current_dir("nested")?;
@@ -5748,12 +5771,7 @@ shell_tool = true
async fn approvals_reviewer_defaults_to_manual_only_without_guardian_feature() -> std::io::Result<()>
{
let codex_home = TempDir::new()?;
let config = ConfigBuilder::default()
.codex_home(codex_home.path().to_path_buf())
.fallback_cwd(Some(codex_home.path().to_path_buf()))
.build()
.await?;
let config = load_isolated_config_from_home(&codex_home).await?;
assert_eq!(config.approvals_reviewer, ApprovalsReviewer::User);
Ok(())
@@ -5770,11 +5788,7 @@ guardian_approval = true
"#,
)?;
let config = ConfigBuilder::default()
.codex_home(codex_home.path().to_path_buf())
.fallback_cwd(Some(codex_home.path().to_path_buf()))
.build()
.await?;
let config = load_isolated_config_from_home(&codex_home).await?;
assert_eq!(config.approvals_reviewer, ApprovalsReviewer::User);
Ok(())
@@ -5790,11 +5804,7 @@ async fn approvals_reviewer_can_be_set_in_config_without_guardian_approval() ->
"#,
)?;
let config = ConfigBuilder::default()
.codex_home(codex_home.path().to_path_buf())
.fallback_cwd(Some(codex_home.path().to_path_buf()))
.build()
.await?;
let config = load_isolated_config_from_home(&codex_home).await?;
assert_eq!(config.approvals_reviewer, ApprovalsReviewer::User);
Ok(())
@@ -5813,11 +5823,7 @@ approvals_reviewer = "guardian_subagent"
"#,
)?;
let config = ConfigBuilder::default()
.codex_home(codex_home.path().to_path_buf())
.fallback_cwd(Some(codex_home.path().to_path_buf()))
.build()
.await?;
let config = load_isolated_config_from_home(&codex_home).await?;
assert_eq!(
config.approvals_reviewer,
@@ -5836,11 +5842,7 @@ smart_approvals = true
"#,
)?;
let config = ConfigBuilder::default()
.codex_home(codex_home.path().to_path_buf())
.fallback_cwd(Some(codex_home.path().to_path_buf()))
.build()
.await?;
let config = load_isolated_config_from_home(&codex_home).await?;
assert!(!config.features.enabled(Feature::GuardianApproval));
assert_eq!(config.approvals_reviewer, ApprovalsReviewer::User);
@@ -5865,11 +5867,7 @@ smart_approvals = true
"#,
)?;
let config = ConfigBuilder::default()
.codex_home(codex_home.path().to_path_buf())
.fallback_cwd(Some(codex_home.path().to_path_buf()))
.build()
.await?;
let config = load_isolated_config_from_home(&codex_home).await?;
assert!(!config.features.enabled(Feature::GuardianApproval));
assert_eq!(config.approvals_reviewer, ApprovalsReviewer::User);

25
codex-rs/core/tests/common/lib.rs
View File

@@ -10,8 +10,8 @@ use tempfile::TempDir;
use codex_core::CodexThread;
use codex_core::config::Config;
use codex_core::config::ConfigBuilder;
use codex_core::config::ConfigOverrides;
use codex_core::config_loader::ConfigLayerStack;
use codex_utils_absolute_path::AbsolutePathBuf;
use regex_lite::Regex;
use std::path::Path;
@@ -183,12 +183,23 @@ pub fn fetch_dotslash_file(
/// temporary directory. Using a per-test directory keeps tests hermetic and
/// avoids clobbering a developer’s real `~/.codex`.
pub async fn load_default_config_for_test(codex_home: &TempDir) -> Config {
ConfigBuilder::default()
.codex_home(codex_home.path().to_path_buf())
.harness_overrides(default_test_overrides())
.build()
.await
.expect("defaults for test should always succeed")
let mut config =
Config::load_default_with_cli_overrides(Vec::new()).expect("default config should load");
let codex_home_path = codex_home.path().to_path_buf();
config.config_layer_stack = ConfigLayerStack::default();
config.startup_warnings.clear();
config.user_instructions = None;
config.cwd = codex_home_path.abs();
config.codex_home = codex_home_path.clone();
config.sqlite_home = codex_home_path.clone();
config.log_dir = codex_home_path.join("log");
let overrides = default_test_overrides();
if let Some(codex_linux_sandbox_exe) = overrides.codex_linux_sandbox_exe {
config.codex_linux_sandbox_exe = Some(codex_linux_sandbox_exe);
}
config
}
#[cfg(target_os = "linux")]