From d7ce0cdf8c4e1fb55aabed5b6717f141c4c8220f Mon Sep 17 00:00:00 2001 From: Lifei Zhou Date: Mon, 5 Oct 2026 11:10:54 +0000 Subject: [PATCH] fix: fixed unstable tests (#12679) --- crates/goose/src/scheduler/full.rs | 29 +++++++++++++++++++----- crates/goose/tests/subprocess_cleanup.rs | 12 +++++----- 2 files changed, 29 insertions(+), 12 deletions(-) diff --git a/crates/goose/src/scheduler/full.rs b/crates/goose/src/scheduler/full.rs index b19ff892e..b1b0bdd19 100644 --- a/crates/goose/src/scheduler/full.rs +++ b/crates/goose/src/scheduler/full.rs @@ -1382,16 +1382,33 @@ mod tests { }; scheduler.add_scheduled_job(job, true).await.unwrap(); - sleep(Duration::from_millis(1500)).await; + let (jobs, sessions) = tokio::time::timeout(Duration::from_secs(3), async { + let mut poll = tokio::time::interval(Duration::from_secs(1)); + loop { + poll.tick().await; + let jobs = scheduler.list_scheduled_jobs().await; + let sessions = session_manager + .list_sessions_by_types(&[SessionType::Scheduled]) + .await + .unwrap(); + if jobs[0].last_run.is_some() && !sessions.is_empty() { + break (jobs, sessions); + } + } + }) + .await + .expect("Scheduled job should run and create a session within 3 seconds"); - let jobs = scheduler.list_scheduled_jobs().await; assert!(jobs[0].last_run.is_some(), "Job should have run"); - let sessions = session_manager - .list_sessions_by_types(&[SessionType::Scheduled]) + assert!( + !sessions.is_empty(), + "Scheduled job should create a session" + ); + assert_eq!(sessions[0].goose_mode, GooseMode::Auto); + scheduler + .remove_scheduled_job("scheduled_job", false) .await .unwrap(); - assert_eq!(sessions.len(), 1); - assert_eq!(sessions[0].goose_mode, GooseMode::Auto); } #[tokio::test] diff --git a/crates/goose/tests/subprocess_cleanup.rs b/crates/goose/tests/subprocess_cleanup.rs index d731ab94a..f23737243 100644 --- a/crates/goose/tests/subprocess_cleanup.rs +++ b/crates/goose/tests/subprocess_cleanup.rs @@ -175,13 +175,13 @@ fn long_lived_child_process_survives_spawning_thread_exit() { ); let deadline = Instant::now() + Duration::from_secs(5); - while process_is_running(child_pid) && Instant::now() < deadline { + while process_is_running(child_pid) { + assert!( + Instant::now() < deadline, + "child process {child_pid} survived parent process death" + ); std::thread::sleep(Duration::from_millis(100)); } - assert!( - !process_is_running(child_pid), - "child process {child_pid} survived parent process death" - ); } fn process_exists(pid: u32) -> bool { @@ -190,7 +190,7 @@ fn process_exists(pid: u32) -> bool { fn process_is_running(pid: u32) -> bool { match process_state(pid) { - Some('Z') | None => false, + Some('Z' | 'X') | None => false, Some(_) => true, } }