agent/codex
2
0
Fork 0
mirror of https://github.com/pchuan98/codex.git synced 2026-07-01 00:31:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix config-loader tests after filesystem abstraction race (#18351)

Browse Source 
## Why

`origin/main` picked up two changes that crossed in flight:

- #18209 refactored config loading to read through `ExecutorFileSystem`,
changing `load_requirements_toml` to take a filesystem handle and an
`AbsolutePathBuf`.
- #17740 added managed `deny_read` requirements tests that still called
`load_requirements_toml` with the previous two-argument signature.

Once both landed, `just clippy` failed because the new tests no longer
matched the current helper API.

## What

- Updates the two managed `deny_read` requirements tests to convert the
fixture path to `AbsolutePathBuf` before loading.
- Passes `LOCAL_FS.as_ref()` into `load_requirements_toml` so these
tests follow the filesystem abstraction introduced by #18209.

## Verification

- `just clippy`
- `cargo test -p codex-core load_requirements_toml_resolves_deny_read`
- `cargo test -p codex-core --test all
unified_exec_enforces_glob_deny_read_policy`
This commit is contained in:
Michael Bolin
2026-04-17 09:20:39 -07:00
committed by GitHub
Unverified
parent 71e4c6fa17
commit d0eff70383
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
codex-rs/core/src/config_loader/tests.rs
+16 -4
View File
@@ -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,
}
);