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

core/tests: neutralize macOS managed preferences in config tests

Browse Source 
Avoid test flakiness caused by host-managed configuration on macOS by
explicitly overriding managed preference data with empty base64 strings in
config loader tests. This keeps the tests deterministic even when the host
machine has MDM-managed settings.

No production behavior changes: the overrides are only used in test fixtures.
This commit is contained in:
Iliyan Malchev
2026-02-12 07:25:23 -08:00
parent b46e9bcc9d
commit 828cf5c867
3 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1786,8 +1786,8 @@ async fn managed_config_overrides_oauth_store_mode() -> anyhow::Result<()> {
let overrides = LoaderOverrides {
managed_config_path: Some(managed_path.clone()),
#[cfg(target_os = "macos")]
managed_preferences_base64: None,
macos_managed_config_requirements_base64: None,
managed_preferences_base64: Some(String::new()),
macos_managed_config_requirements_base64: Some(String::new()),
};
let cwd = codex_home.path().abs();
@@ -1916,8 +1916,8 @@ async fn managed_config_wins_over_cli_overrides() -> anyhow::Result<()> {
let overrides = LoaderOverrides {
managed_config_path: Some(managed_path),
#[cfg(target_os = "macos")]
managed_preferences_base64: None,
macos_managed_config_requirements_base64: None,
managed_preferences_base64: Some(String::new()),
macos_managed_config_requirements_base64: Some(String::new()),
};
let cwd = codex_home.path().abs();

28
codex-rs/core/src/config/service_tests.rs
View File

@@ -181,8 +181,8 @@ async fn read_includes_origins_and_layers() {
LoaderOverrides {
managed_config_path: Some(managed_path.clone()),
#[cfg(target_os = "macos")]
managed_preferences_base64: None,
macos_managed_config_requirements_base64: None,
managed_preferences_base64: Some(String::new()),
macos_managed_config_requirements_base64: Some(String::new()),
},
CloudRequirementsLoader::default(),
);
@@ -304,8 +304,8 @@ async fn write_value_reports_override() {
LoaderOverrides {
managed_config_path: Some(managed_path.clone()),
#[cfg(target_os = "macos")]
managed_preferences_base64: None,
macos_managed_config_requirements_base64: None,
managed_preferences_base64: Some(String::new()),
macos_managed_config_requirements_base64: Some(String::new()),
},
CloudRequirementsLoader::default(),
);
@@ -408,8 +408,8 @@ async fn invalid_user_value_rejected_even_if_overridden_by_managed() {
LoaderOverrides {
managed_config_path: Some(managed_path.clone()),
#[cfg(target_os = "macos")]
managed_preferences_base64: None,
macos_managed_config_requirements_base64: None,
managed_preferences_base64: Some(String::new()),
macos_managed_config_requirements_base64: Some(String::new()),
},
CloudRequirementsLoader::default(),
);
@@ -473,8 +473,8 @@ async fn write_value_rejects_feature_requirement_conflict() {
LoaderOverrides {
managed_config_path: None,
#[cfg(target_os = "macos")]
managed_preferences_base64: None,
macos_managed_config_requirements_base64: None,
managed_preferences_base64: Some(String::new()),
macos_managed_config_requirements_base64: Some(String::new()),
},
CloudRequirementsLoader::new(async {
Ok(Some(ConfigRequirementsToml {
@@ -524,8 +524,8 @@ async fn write_value_rejects_profile_feature_requirement_conflict() {
LoaderOverrides {
managed_config_path: None,
#[cfg(target_os = "macos")]
managed_preferences_base64: None,
macos_managed_config_requirements_base64: None,
managed_preferences_base64: Some(String::new()),
macos_managed_config_requirements_base64: Some(String::new()),
},
CloudRequirementsLoader::new(async {
Ok(Some(ConfigRequirementsToml {
@@ -586,8 +586,8 @@ async fn read_reports_managed_overrides_user_and_session_flags() {
LoaderOverrides {
managed_config_path: Some(managed_path.clone()),
#[cfg(target_os = "macos")]
managed_preferences_base64: None,
macos_managed_config_requirements_base64: None,
managed_preferences_base64: Some(String::new()),
macos_managed_config_requirements_base64: Some(String::new()),
},
CloudRequirementsLoader::default(),
);
@@ -644,8 +644,8 @@ async fn write_value_reports_managed_override() {
LoaderOverrides {
managed_config_path: Some(managed_path.clone()),
#[cfg(target_os = "macos")]
managed_preferences_base64: None,
macos_managed_config_requirements_base64: None,
managed_preferences_base64: Some(String::new()),
macos_managed_config_requirements_base64: Some(String::new()),
},
CloudRequirementsLoader::default(),
);

8
codex-rs/core/src/config_loader/tests.rs
View File

@@ -205,8 +205,8 @@ extra = true
let overrides = LoaderOverrides {
managed_config_path: Some(managed_path),
#[cfg(target_os = "macos")]
managed_preferences_base64: None,
macos_managed_config_requirements_base64: None,
managed_preferences_base64: Some(String::new()),
macos_managed_config_requirements_base64: Some(String::new()),
};
let cwd = AbsolutePathBuf::try_from(tmp.path()).expect("cwd");
@@ -245,7 +245,7 @@ async fn returns_empty_when_all_layers_missing() {
// Force managed preferences to resolve as empty so this test does not
// inherit non-empty machine-specific managed state.
managed_preferences_base64: Some(String::new()),
macos_managed_config_requirements_base64: None,
macos_managed_config_requirements_base64: Some(String::new()),
};
let cwd = AbsolutePathBuf::try_from(tmp.path()).expect("cwd");
@@ -342,7 +342,7 @@ flag = false
managed_preferences_base64: Some(
base64::prelude::BASE64_STANDARD.encode(raw_managed_preferences.as_bytes()),
),
macos_managed_config_requirements_base64: None,
macos_managed_config_requirements_base64: Some(String::new()),
};
let cwd = AbsolutePathBuf::try_from(tmp.path()).expect("cwd");