mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-07-17 14:42:06 +00:00
Keep #60631's get_running_job_ids() snapshot + _active_cron_job_count() (import-guarded for minimal test doubles) as the single read path, and retarget #60612's drain tests at it. Drops the redundant cron_jobs_in_flight() helper so there is one surface, not two.
This commit is contained in:
parent
8a573bb6e7
commit
ecc6725855
2 changed files with 5 additions and 12 deletions
|
|
@ -22,13 +22,13 @@ async def test_drain_active_agents_waits_for_in_flight_cron_jobs():
|
|||
cron_count = [1]
|
||||
|
||||
def _cron_in_flight():
|
||||
return cron_count[0]
|
||||
return frozenset(f"job-{i}" for i in range(cron_count[0]))
|
||||
|
||||
async def finish_cron():
|
||||
await asyncio.sleep(0.15)
|
||||
cron_count[0] = 0
|
||||
|
||||
with patch("cron.scheduler.cron_jobs_in_flight", side_effect=_cron_in_flight):
|
||||
with patch("cron.scheduler.get_running_job_ids", side_effect=_cron_in_flight):
|
||||
task = asyncio.create_task(finish_cron())
|
||||
_snapshot, timed_out = await runner._drain_active_agents(1.0)
|
||||
await task
|
||||
|
|
@ -42,7 +42,7 @@ async def test_drain_active_agents_times_out_when_cron_still_running():
|
|||
runner, _adapter = make_restart_runner()
|
||||
runner._running_agents = {}
|
||||
|
||||
with patch("cron.scheduler.cron_jobs_in_flight", return_value=1):
|
||||
with patch("cron.scheduler.get_running_job_ids", return_value=frozenset({"job-1"})):
|
||||
_snapshot, timed_out = await runner._drain_active_agents(0.05)
|
||||
|
||||
assert timed_out is True
|
||||
|
|
@ -59,7 +59,7 @@ async def test_gateway_stop_waits_for_cron_before_final_tool_kill():
|
|||
call_order: list[str] = []
|
||||
|
||||
def _cron_in_flight():
|
||||
return cron_count[0]
|
||||
return frozenset(f"job-{i}" for i in range(cron_count[0]))
|
||||
|
||||
def _fake_kill_all(task_id=None):
|
||||
call_order.append("kill_all")
|
||||
|
|
@ -70,7 +70,7 @@ async def test_gateway_stop_waits_for_cron_before_final_tool_kill():
|
|||
cron_count[0] = 0
|
||||
|
||||
with (
|
||||
patch("cron.scheduler.cron_jobs_in_flight", side_effect=_cron_in_flight),
|
||||
patch("cron.scheduler.get_running_job_ids", side_effect=_cron_in_flight),
|
||||
patch("gateway.status.remove_pid_file"),
|
||||
patch("gateway.status.write_runtime_status"),
|
||||
patch("agent.auxiliary_client.shutdown_cached_clients"),
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue