tkmind/tkmind_go
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

refactor(tests): make logging test in goose-cli less flaky on macos (#3273)

Browse Source
This commit is contained in:
Prem Pillai
2025-07-07 20:51:55 +10:00
committed by GitHub
parent 991e3a9c0e
commit 976f95d2e6
1 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/goose-cli/src/logging.rs
+20 -17
View File
@@ -224,23 +224,26 @@ mod tests {
} }
async fn do_test_log_file_name(session_name: Option<&str>, _with_error_capture: bool) { async fn do_test_log_file_name(session_name: Option<&str>, _with_error_capture: bool) {
// Create a unique test directory for each test use tempfile::TempDir;
let test_name = session_name.unwrap_or("no_session");
let random_suffix = rand::random::<u32>() % 100000000; // Create a unique prefix to avoid test interference
let test_dir = PathBuf::from(format!( let test_id = format!(
"/tmp/goose_test_home_{}_{}", "{}_{}",
test_name, random_suffix session_name.unwrap_or("no_session"),
)); rand::random::<u32>()
if test_dir.exists() { );
fs::remove_dir_all(&test_dir).unwrap();
} // Create a proper temporary directory that will be automatically cleaned up
fs::create_dir_all(&test_dir).unwrap(); let _temp_dir = TempDir::with_prefix(&format!("goose_test_{}_", test_id)).unwrap();
let test_dir = _temp_dir.path();
// Set up environment // Set up environment
if cfg!(windows) { if cfg!(windows) {
env::set_var("USERPROFILE", &test_dir); env::set_var("USERPROFILE", test_dir);
} else { } else {
env::set_var("HOME", &test_dir); env::set_var("HOME", test_dir);
// Also set TMPDIR to prevent temp directory sharing between tests
env::set_var("TMPDIR", test_dir);
} }
// Create error capture if needed - but don't use it in tests to avoid tokio runtime issues // Create error capture if needed - but don't use it in tests to avoid tokio runtime issues
@@ -251,8 +254,10 @@ mod tests {
println!("Before timestamp: {}", before_timestamp); println!("Before timestamp: {}", before_timestamp);
// Get the log directory and clean any existing log files // Get the log directory and clean any existing log files
let random_suffix = rand::random::<u32>() % 100000000;
let log_dir = get_log_directory_with_date(Some(format!("test-{}", random_suffix))).unwrap(); let log_dir = get_log_directory_with_date(Some(format!("test-{}", random_suffix))).unwrap();
println!("Log directory: {}", log_dir.display()); println!("Log directory: {}", log_dir.display());
println!("Test directory: {}", test_dir.display());
if log_dir.exists() { if log_dir.exists() {
for entry in fs::read_dir(&log_dir).unwrap() { for entry in fs::read_dir(&log_dir).unwrap() {
let entry = entry.unwrap(); let entry = entry.unwrap();
@@ -429,10 +434,8 @@ mod tests {
// Wait a moment to ensure all files are written // Wait a moment to ensure all files are written
std::thread::sleep(std::time::Duration::from_millis(100)); std::thread::sleep(std::time::Duration::from_millis(100));
// Clean up test directory // Keep _temp_dir alive until the end so it doesn't get cleaned up prematurely
fs::remove_dir_all(&test_dir).unwrap_or_else(|e| { drop(_temp_dir);
println!("Warning: Failed to clean up test directory: {}", e);
});
} }
#[tokio::test] #[tokio::test]