From e9052bce30fc31db6e8c9717028e78c14e5fa0db Mon Sep 17 00:00:00 2001 From: Michael Bolin Date: Fri, 17 Apr 2026 09:05:20 -0700 Subject: [PATCH] fix build breakage resulting from merge race --- codex-rs/core/src/config_loader/tests.rs | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/codex-rs/core/src/config_loader/tests.rs b/codex-rs/core/src/config_loader/tests.rs index ee2e056c57..eb533c4ca9 100644 --- a/codex-rs/core/src/config_loader/tests.rs +++ b/codex-rs/core/src/config_loader/tests.rs @@ -749,8 +749,14 @@ deny_read = ["./sensitive", "../shared/secret.txt"] ) .await?; + let requirements_file = AbsolutePathBuf::try_from(requirements_file)?; let mut config_requirements_toml = ConfigRequirementsWithSources::default(); - load_requirements_toml(&mut config_requirements_toml, &requirements_file).await?; + load_requirements_toml( + LOCAL_FS.as_ref(), + &mut config_requirements_toml, + &requirements_file, + ) + .await?; let permissions = config_requirements_toml .permissions @@ -775,7 +781,7 @@ deny_read = ["./sensitive", "../shared/secret.txt"] assert_eq!( permissions.source, RequirementSource::SystemRequirementsToml { - file: AbsolutePathBuf::try_from(requirements_file)?, + file: requirements_file, } ); @@ -797,8 +803,14 @@ deny_read = ["./sensitive/**/*.txt"] ) .await?; + let requirements_file = AbsolutePathBuf::try_from(requirements_file)?; let mut config_requirements_toml = ConfigRequirementsWithSources::default(); - load_requirements_toml(&mut config_requirements_toml, &requirements_file).await?; + load_requirements_toml( + LOCAL_FS.as_ref(), + &mut config_requirements_toml, + &requirements_file, + ) + .await?; let permissions = config_requirements_toml .permissions @@ -824,7 +836,7 @@ deny_read = ["./sensitive/**/*.txt"] assert_eq!( permissions.source, RequirementSource::SystemRequirementsToml { - file: AbsolutePathBuf::try_from(requirements_file)?, + file: requirements_file, } );