Fix/修复测试用例竞态等问题 #571

Merged
k88936 merged 8 commits from fix/test-concurrent-problem into master 2026-10-02 01:51:59 +08:00
5 changed files with 17 additions and 13 deletions
Showing only changes of commit 348d20bf55 - Show all commits
@@ -2765,18 +2765,18 @@ async fn background_agent_runtime_can_create_checkpoint_before_file_write() {
.expect("start background task");
let plan_request = receiver
.recv_timeout(Duration::from_secs(2))
.recv_timeout(MOCK_PROVIDER_REQUEST_TIMEOUT)
.expect("plan llm request");
assert!(plan_request.contains("project.checkpoint"));
assert!(plan_request.contains("file.write"));
let final_request = receiver
.recv_timeout(Duration::from_secs(2))
.recv_timeout(MOCK_PROVIDER_REQUEST_TIMEOUT)
.expect("final reply llm request");
assert!(final_request.contains("project.checkpoint"));
assert!(final_request.contains("已创建 checkpoint checkpoint-"));
assert!(final_request.contains("file.write"));
let verified_final_request = receiver
.recv_timeout(Duration::from_secs(10))
.recv_timeout(MOCK_PROVIDER_REQUEST_TIMEOUT)
.expect("final request after checkpoint write verification");
assert!(verified_final_request.contains("project.verify"));
assert!(verified_final_request.contains("AGENT_RUNTIME_CURRENT_REVISION_OK"));
@@ -721,12 +721,12 @@ async fn background_agent_runtime_can_schedule_ready_manifest_tasks() {
.contains("处理 manifest ready 任务:拆解创作方向"));
let plan_request = receiver
.recv_timeout(Duration::from_secs(2))
.recv_timeout(MOCK_PROVIDER_REQUEST_TIMEOUT)
.expect("plan llm request");
assert!(plan_request.contains("处理 manifest ready 任务:拆解创作方向"));
assert!(plan_request.contains("task.update"));
let final_request = receiver
.recv_timeout(Duration::from_secs(2))
.recv_timeout(MOCK_PROVIDER_REQUEST_TIMEOUT)
.expect("final reply llm request");
assert!(final_request.contains("任务 design-director 已更新为 completed"));
@@ -904,11 +904,11 @@ async fn background_agent_runtime_loads_same_agent_continuity_through_tool_obser
)
.expect("start first design task");
let first_plan_request = receiver
.recv_timeout(Duration::from_secs(2))
.recv_timeout(MOCK_PROVIDER_REQUEST_TIMEOUT)
.expect("first design plan request");
assert!(first_plan_request.contains("首轮检查连续上下文"));
let first_replan_request = receiver
.recv_timeout(Duration::from_secs(2))
.recv_timeout(MOCK_PROVIDER_REQUEST_TIMEOUT)
.expect("first design replan request");
assert!(first_replan_request.contains("连续上下文笔记:第一轮已经确认月光厨房核心循环"));
let first_runtime = wait_for_agent_runtime_idle(&root, "design-director");
@@ -930,7 +930,7 @@ async fn background_agent_runtime_loads_same_agent_continuity_through_tool_obser
)
.expect("start art task");
let art_request = receiver
.recv_timeout(Duration::from_secs(2))
.recv_timeout(MOCK_PROVIDER_REQUEST_TIMEOUT)
.expect("art plan request");
assert!(art_request.contains("美术无关任务"));
assert!(!art_request.contains("design-continuity-first"));
@@ -947,7 +947,7 @@ async fn background_agent_runtime_loads_same_agent_continuity_through_tool_obser
)
.expect("start second design task");
let second_design_request = receiver
.recv_timeout(Duration::from_secs(2))
.recv_timeout(MOCK_PROVIDER_REQUEST_TIMEOUT)
.expect("second design plan request");
assert!(second_design_request.contains("模板 taskId=design-director"));
assert!(!second_design_request.contains("contextBoundary:"));
@@ -958,7 +958,7 @@ async fn background_agent_runtime_loads_same_agent_continuity_through_tool_obser
assert!(!second_design_request.contains("连续上下文笔记:第一轮已经确认月光厨房核心循环"));
assert!(!second_design_request.contains("design-continuity-first [completed / completed]"));
let second_design_replan_request = receiver
.recv_timeout(Duration::from_secs(2))
.recv_timeout(MOCK_PROVIDER_REQUEST_TIMEOUT)
.expect("second design replan request after runtime observation");
assert!(second_design_replan_request.contains("agent.run_status"));
assert!(second_design_replan_request.contains("conversation.read"));
@@ -3,7 +3,7 @@ pub(super) use std::{
fs,
path::Path,
sync::{mpsc, Arc, Condvar, Mutex as StdMutex},
time::Duration,
time::{Duration, Instant},
};
pub(super) use serde_json::Value;
@@ -28,6 +28,7 @@ pub(super) use super::super::{
wait_for_agent_runtime_terminal_and_lane_release, wait_for_captured_mock_request,
write_agent_runtime_task_record_for_test, write_agent_runtime_verification_fixture,
write_static_smoke_game_fixture_for_test, write_test_local_config,
AGENT_RUNTIME_TERMINAL_WAIT_BUDGET, MOCK_PROVIDER_REQUEST_TIMEOUT,
};
pub(super) use crate::{
@@ -177,7 +177,7 @@ async fn background_agent_runtime_can_cancel_active_task_and_retry_it() {
)
.expect("start active task");
let first_request = request_receiver
.recv_timeout(Duration::from_secs(2))
.recv_timeout(MOCK_PROVIDER_REQUEST_TIMEOUT)
.expect("first request");
assert!(first_request.contains("需要取消后重试的后台任务"));
@@ -202,7 +202,10 @@ async fn background_agent_runtime_can_cancel_active_task_and_retry_it() {
.expect("release first request");
let mut cancelled_result =
read_game_creator_agent_runtime_at(&root, "design-director").expect("read cancelled");
for _ in 0..50 {
// 取消收口同样要等后台 worker 真正停稳;CI 上分片并发放大会把它拖过 1 秒,
// 因此改用与其它终态等待一致的硬预算,而不是固定 50 × 20ms。
let cancel_deadline = Instant::now() + AGENT_RUNTIME_TERMINAL_WAIT_BUDGET;
while Instant::now() < cancel_deadline {
if game_creator_agent_runtime_task_lock_is_available(&root, "design-director")
.expect("inspect cancelled runtime lock")
&& cancelled_result.state.status == "cancelled"