Skip to content

ostree-ext: Replace config loading with a stub if we detect mock #1695

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

ostree-ext: Replace config loading with a stub if we detect mock #1695

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion crates/ostree-ext/src/globals.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,14 @@ impl ConfigPaths {

/// Return the path to the global container authentication file, if it exists.
pub fn get_global_authfile(root: &Dir) -> Result<Option<(Utf8PathBuf, File)>> {
let root = &RootDir::new(root, ".")?;
let am_uid0 = rustix::process::getuid() == rustix::process::Uid::ROOT;
// Workaround for https://github.com/rpm-software-management/mock/pull/1613#issuecomment-3421908652
#[cfg(test)]
if !am_uid0 {
return Ok(None);
}

let root = &RootDir::new(root, ".")?;
get_global_authfile_impl(root, am_uid0)
}

Expand Down Expand Up @@ -115,6 +121,7 @@ mod tests {
}

#[test]
#[ignore = "https://github.com/rpm-software-management/mock/pull/1613#issuecomment-3421908652"]
fn test_config_paths() -> Result<()> {
let root = &cap_tempfile::TempDir::new(cap_std::ambient_authority())?;
let rootdir = &RootDir::new(root, ".")?;
Expand Down