Skip to content

Fix leaky env variable causing flaky test #3761

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
DOsinga merged 2 commits into from
Aug 5, 2025
+22 −14
Merged

Fix leaky env variable causing flaky test #3761

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e23008
fix leaking env variables
katzdave Jul 31, 2025
eb9db0a
fix warning
katzdave Jul 31, 2025
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
35 changes: 22 additions & 13 deletions crates/goose/src/model.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,19 +247,28 @@ mod tests {

#[test]
fn test_model_config_context_limits() {
let config = ModelConfig::new("claude-3-opus")
.unwrap()
.with_context_limit(Some(150_000));
assert_eq!(config.context_limit(), 150_000);

let config = ModelConfig::new("claude-3-opus").unwrap();
assert_eq!(config.context_limit(), 200_000);

let config = ModelConfig::new("gpt-4-turbo").unwrap();
assert_eq!(config.context_limit(), 128_000);

let config = ModelConfig::new("unknown-model").unwrap();
assert_eq!(config.context_limit(), DEFAULT_CONTEXT_LIMIT);
// Clear all GOOSE environment variables to ensure clean test environment
with_var("GOOSE_TEMPERATURE", None::<&str>, || {
Copy link
Collaborator

@DOsinga DOsinga Aug 2, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this with_var looks nice, but shouldn't this be at the other test that actually sets these? of course relying on these in tests is crazy to begin with

ceterum censeo variabiles ambientis esse delendas

with_var("GOOSE_CONTEXT_LIMIT", None::<&str>, || {
with_var("GOOSE_TOOLSHIM", None::<&str>, || {
with_var("GOOSE_TOOLSHIM_OLLAMA_MODEL", None::<&str>, || {
let config = ModelConfig::new("claude-3-opus")
.unwrap()
.with_context_limit(Some(150_000));
assert_eq!(config.context_limit(), 150_000);

let config = ModelConfig::new("claude-3-opus").unwrap();
assert_eq!(config.context_limit(), 200_000);

let config = ModelConfig::new("gpt-4-turbo").unwrap();
assert_eq!(config.context_limit(), 128_000);

let config = ModelConfig::new("unknown-model").unwrap();
assert_eq!(config.context_limit(), DEFAULT_CONTEXT_LIMIT);
});
});
});
});
}

#[test]
Expand Down
1 change: 0 additions & 1 deletion crates/goose/src/providers/claude_code.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,7 +518,6 @@ impl Provider for ClaudeCodeProvider {
mod tests {
use super::ModelConfig;
use super::*;
use temp_env::with_var;

#[test]
fn test_claude_code_model_config() {
Expand Down
Loading