Skip to content

Fix flaky config env-var test race #675

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

Merged
yoshuawuyts merged 1 commit into from
Jun 2, 2026
Merged

Fix flaky config env-var test race #675

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
58 changes: 19 additions & 39 deletions src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,6 @@ impl Config {

#[cfg(test)]
mod tests {
use std::ffi::OsString;
use std::fs;

use tempfile::TempDir;
Expand Down Expand Up @@ -223,32 +222,6 @@ mod tests {
}
}

struct SetEnv<'a> {
old: Option<OsString>,
key: &'a str,
}

impl Drop for SetEnv<'_> {
fn drop(&mut self) {
if let Some(old_value) = &self.old {
std::env::set_var(self.key, old_value);
} else {
std::env::remove_var(self.key);
}
}
}

impl<'a> SetEnv<'a> {
fn new(key: &'a str, value: &'a str) -> Self {
let old_value = std::env::var_os(key);
std::env::set_var(key, value);
SetEnv {
old: old_value,
key,
}
}
}

#[test]
fn test_config_file_not_exists_succeeds_with_defaults() {
let temp_dir = TempDir::new().unwrap();
Expand Down Expand Up @@ -332,14 +305,15 @@ component_dir = "/config/component/dir"
// It should try to use the default config location, which likely won't exist
// but should still succeed with defaults

// Ensure WASSETTE_CONFIG_FILE is not set
std::env::remove_var("WASSETTE_CONFIG_FILE");

let serve_config = create_test_cli_config();
let config = Config::new(&serve_config).expect("Failed to create config");
// Ensure WASSETTE_CONFIG_FILE is not set, using temp_env to serialize
// access to the shared environment variable across tests.
temp_env::with_var_unset("WASSETTE_CONFIG_FILE", || {
let serve_config = create_test_cli_config();
let config = Config::new(&serve_config).expect("Failed to create config");

// Should use CLI defaults since no config file exists
assert_eq!(config.component_dir, PathBuf::from("/test/component/dir"));
// Should use CLI defaults since no config file exists
assert_eq!(config.component_dir, PathBuf::from("/test/component/dir"));
});
}

#[test]
Expand Down Expand Up @@ -372,12 +346,18 @@ policy_file = "custom_policy.yaml"
"#;
fs::write(&config_file, toml_content).unwrap();

// Use SetEnv helper to manage WASSETTE_CONFIG_FILE environment variable
let _env = SetEnv::new("WASSETTE_CONFIG_FILE", config_file.to_str().unwrap());

let config = Config::new(&empty_test_cli_config()).expect("Failed to create config");
// Use temp_env to serialize access to the shared WASSETTE_CONFIG_FILE
// environment variable, preventing races with other tests.
temp_env::with_var(
"WASSETTE_CONFIG_FILE",
Some(config_file.to_str().unwrap()),
|| {
let config =
Config::new(&empty_test_cli_config()).expect("Failed to create config");

assert_eq!(config.component_dir, PathBuf::from("/custom/component/dir"));
assert_eq!(config.component_dir, PathBuf::from("/custom/component/dir"));
},
);
}

#[test]
Expand Down
Loading