mirror of
https://github.com/HKUDS/nanobot.git
synced 2026-08-07 21:08:34 +03:00
fix(cron): preserve manual run completion state
This commit is contained in:
@@ -600,6 +600,83 @@ async def test_run_job_preserves_running_service_state(tmp_path) -> None:
|
||||
service.stop()
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_manual_run_persists_completion_when_callback_lists_jobs(tmp_path) -> None:
|
||||
store_path = tmp_path / "cron" / "jobs.json"
|
||||
|
||||
async def on_job(_job) -> None:
|
||||
service.list_jobs(include_disabled=True)
|
||||
await asyncio.sleep(0)
|
||||
|
||||
service = CronService(store_path, on_job=on_job)
|
||||
job = service.add_job(
|
||||
name="manual",
|
||||
schedule=CronSchedule(kind="every", every_ms=60_000),
|
||||
message="hello",
|
||||
**_bound_chat(),
|
||||
)
|
||||
|
||||
assert await service.run_job(job.id) is True
|
||||
|
||||
state = json.loads(store_path.read_text())["jobs"][0]["state"]
|
||||
assert state["lastStatus"] == "ok"
|
||||
assert state["lastError"] is None
|
||||
assert len(state["runHistory"]) == 1
|
||||
assert state["runHistory"][0]["status"] == "ok"
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_overlapping_manual_runs_preserve_stopped_service_state(tmp_path) -> None:
|
||||
store_path = tmp_path / "cron" / "jobs.json"
|
||||
entered = [asyncio.Event(), asyncio.Event()]
|
||||
release = [asyncio.Event(), asyncio.Event()]
|
||||
call_count = 0
|
||||
|
||||
async def on_job(_job) -> None:
|
||||
nonlocal call_count
|
||||
call_index = call_count
|
||||
call_count += 1
|
||||
entered[call_index].set()
|
||||
await release[call_index].wait()
|
||||
|
||||
service = CronService(store_path, on_job=on_job)
|
||||
jobs = [
|
||||
service.add_job(
|
||||
name=f"manual-{index}",
|
||||
schedule=CronSchedule(kind="every", every_ms=60_000),
|
||||
message="hello",
|
||||
**_bound_chat(str(index)),
|
||||
)
|
||||
for index in range(2)
|
||||
]
|
||||
|
||||
first = asyncio.create_task(service.run_job(jobs[0].id))
|
||||
await entered[0].wait()
|
||||
second = asyncio.create_task(service.run_job(jobs[1].id))
|
||||
try:
|
||||
await entered[1].wait()
|
||||
release[0].set()
|
||||
assert await first is True
|
||||
assert service._running is False
|
||||
|
||||
release[1].set()
|
||||
assert await second is True
|
||||
assert service._running is False
|
||||
assert service._timer_task is None
|
||||
|
||||
states = {
|
||||
item["name"]: item["state"]
|
||||
for item in json.loads(store_path.read_text())["jobs"]
|
||||
}
|
||||
assert states["manual-0"]["lastStatus"] == "ok"
|
||||
assert states["manual-1"]["lastStatus"] == "ok"
|
||||
finally:
|
||||
release[0].set()
|
||||
release[1].set()
|
||||
await asyncio.gather(first, second, return_exceptions=True)
|
||||
service.stop()
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_running_service_honors_external_disable(tmp_path) -> None:
|
||||
store_path = tmp_path / "cron" / "jobs.json"
|
||||
|
||||
Reference in New Issue
Block a user