test: stabilize subagent cleanup and session ID tests (#12939)

This commit is contained in:
Lifei Zhou
2026-10-16 03:44:36 +00:00
committed by GitHub
parent 5eca486214
commit 44c2ed53b2
2 changed files with 14 additions and 12 deletions
@@ -1435,20 +1435,22 @@ async fn cancelling_the_parent_ends_a_waiting_subagent() -> Result<()> {
let subagent_id = tokio::time::timeout(Duration::from_secs(10), async {
loop {
if let [subagent_id] = hook_sessions(&hook_log, "SessionEnd").as_slice() {
return subagent_id.clone();
if !agent.tracks_confirmations_for(subagent_id)
&& agent
.extension_manager
.scope_lease(subagent_id)
.await
.configs()
.is_empty()
{
return subagent_id.clone();
}
}
tokio::time::sleep(Duration::from_millis(20)).await;
}
})
.await?;
assert_ne!(subagent_id, session_id);
assert!(!agent.tracks_confirmations_for(&subagent_id));
assert!(agent
.extension_manager
.scope_lease(&subagent_id)
.await
.configs()
.is_empty());
Ok(())
}
@@ -211,7 +211,7 @@ async fn test_session_id_propagates_to_log_records() {
#[tokio::test]
async fn test_session_id_propagation_to_llm() {
let (_, capture, provider) = setup_mock_server().await;
let (_server, capture, provider) = setup_mock_server().await;
make_request(provider.as_ref(), "integration-test-session-123").await;
@@ -252,7 +252,7 @@ async fn test_explicit_prompt_cache_key_overrides_session_id() {
#[tokio::test]
async fn test_session_id_always_present() {
let (_, capture, provider) = setup_mock_server().await;
let (_server, capture, provider) = setup_mock_server().await;
make_request(provider.as_ref(), "test-session-id").await;
@@ -264,7 +264,7 @@ async fn test_session_id_always_present() {
#[tokio::test]
async fn test_session_id_matches_across_calls() {
let (_, capture, provider) = setup_mock_server().await;
let (_server, capture, provider) = setup_mock_server().await;
let session_id = "consistent-session-456";
make_request(provider.as_ref(), session_id).await;
@@ -279,7 +279,7 @@ async fn test_session_id_matches_across_calls() {
#[tokio::test]
async fn test_different_sessions_have_different_ids() {
let (_, capture, provider) = setup_mock_server().await;
let (_server, capture, provider) = setup_mock_server().await;
let session_id_1 = "session-one";
let session_id_2 = "session-two";