mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-06-25 11:02:03 +00:00
58b19a4f69
Phase 4A. Factor tick's per-job closure (_process_job: execute → save → deliver → mark) into a module-level run_one_job(job, *, adapters, loop, verbose) so the external Chronos provider's fire_due (Phase 4D) reuses the IDENTICAL body — no duplicated correctness. tick's _process_job is now a thin wrapper calling run_one_job; the pool/in-flight-guard/contextvars dispatch logic is unchanged. run_one_job fires ONE given job; it does NOT decide due-ness, claim, or compute next_run (tick advances next_run_at under the file lock; an external provider claims via the store CAS in Phase 4C). Pure refactor, no behavior change. TDD: test_run_one_job.py characterizes the sequence through tick() first (test_tick_process_job_sequence, passed pre-extraction), then unit-tests the helper directly: success sequence, [SILENT]→skip delivery, empty-response soft failure (#8585), failed-job-still-delivers, exception→mark-failed. Verified: tests/cron/ 459 passed (was 453 + 6 new); tick behavior unchanged.
119 lines
4.2 KiB
Python
119 lines
4.2 KiB
Python
"""Characterization + unit tests for the `run_one_job` shared helper (Phase 4A).
|
|
|
|
`tick`'s per-job body (`_process_job`) is the execute → save → deliver → mark
|
|
sequence that fires ONE due job. Phase 4A extracts it into a module-level
|
|
`run_one_job(job, *, adapters=None, loop=None, verbose=False)` so the external
|
|
Chronos provider's `fire_due` can reuse the IDENTICAL body — no duplicated
|
|
correctness.
|
|
|
|
The first test characterizes the sequence as driven through `tick()` (proving
|
|
the extraction didn't change `tick`'s behavior); the rest unit-test the
|
|
extracted helper directly.
|
|
"""
|
|
import cron.scheduler as s
|
|
|
|
|
|
def _patch_pipeline(monkeypatch, *, success=True, output="out", final="final response",
|
|
error=None, silent_marker_in=None):
|
|
"""Patch the job pipeline primitives and record the call order."""
|
|
calls = []
|
|
|
|
def fake_run_job(job):
|
|
calls.append(("run_job", job["id"]))
|
|
fr = final if silent_marker_in is None else silent_marker_in
|
|
return (success, output, fr, error)
|
|
|
|
def fake_save(jid, out):
|
|
calls.append(("save", jid))
|
|
return f"/tmp/{jid}.txt"
|
|
|
|
def fake_deliver(job, content, adapters=None, loop=None):
|
|
calls.append(("deliver", job["id"]))
|
|
return None
|
|
|
|
def fake_mark(jid, ok, err=None, delivery_error=None):
|
|
calls.append(("mark", jid, ok))
|
|
|
|
monkeypatch.setattr(s, "run_job", fake_run_job)
|
|
monkeypatch.setattr(s, "save_job_output", fake_save)
|
|
monkeypatch.setattr(s, "_deliver_result", fake_deliver)
|
|
monkeypatch.setattr(s, "mark_job_run", fake_mark)
|
|
return calls
|
|
|
|
|
|
def test_tick_process_job_sequence(monkeypatch):
|
|
"""Characterization: a single due job driven through tick() runs the
|
|
sequence run_job → save → deliver → mark, in that order."""
|
|
calls = _patch_pipeline(monkeypatch)
|
|
monkeypatch.setattr(s, "get_due_jobs", lambda: [{"id": "j1", "name": "t"}])
|
|
monkeypatch.setattr(s, "advance_next_run", lambda jid: True)
|
|
|
|
s.tick(verbose=False, sync=True)
|
|
|
|
assert [c[0] for c in calls] == ["run_job", "save", "deliver", "mark"]
|
|
assert calls[-1] == ("mark", "j1", True)
|
|
|
|
|
|
def test_run_one_job_success_sequence(monkeypatch):
|
|
"""The extracted helper runs the same execute→save→deliver→mark sequence
|
|
for a successful job."""
|
|
calls = _patch_pipeline(monkeypatch)
|
|
|
|
ok = s.run_one_job({"id": "j2", "name": "t"})
|
|
|
|
assert ok is True
|
|
assert [c[0] for c in calls] == ["run_job", "save", "deliver", "mark"]
|
|
assert calls[-1] == ("mark", "j2", True)
|
|
|
|
|
|
def test_run_one_job_silent_skips_delivery(monkeypatch):
|
|
"""A [SILENT] final response saves output + marks the run but does NOT
|
|
deliver."""
|
|
calls = _patch_pipeline(monkeypatch, silent_marker_in="[SILENT]")
|
|
|
|
s.run_one_job({"id": "j3", "name": "t"})
|
|
|
|
kinds = [c[0] for c in calls]
|
|
assert "run_job" in kinds and "save" in kinds and "mark" in kinds
|
|
assert "deliver" not in kinds
|
|
|
|
|
|
def test_run_one_job_empty_response_is_soft_failure(monkeypatch):
|
|
"""An empty final response marks the run as NOT ok (issue #8585)."""
|
|
calls = _patch_pipeline(monkeypatch, final=" ")
|
|
|
|
s.run_one_job({"id": "j4", "name": "t"})
|
|
|
|
mark = [c for c in calls if c[0] == "mark"][0]
|
|
assert mark == ("mark", "j4", False)
|
|
|
|
|
|
def test_run_one_job_failed_job_delivers_error(monkeypatch):
|
|
"""A failed job still delivers (the error notice) and marks not-ok."""
|
|
calls = _patch_pipeline(monkeypatch, success=False, final="", error="boom")
|
|
|
|
s.run_one_job({"id": "j5", "name": "t"})
|
|
|
|
kinds = [c[0] for c in calls]
|
|
assert "deliver" in kinds # failures always deliver
|
|
mark = [c for c in calls if c[0] == "mark"][0]
|
|
assert mark == ("mark", "j5", False)
|
|
|
|
|
|
def test_run_one_job_exception_marks_failure(monkeypatch):
|
|
"""If run_job raises, the helper marks the run failed and returns False
|
|
rather than propagating."""
|
|
def boom(job):
|
|
raise RuntimeError("kaboom")
|
|
|
|
monkeypatch.setattr(s, "run_job", boom)
|
|
marks = []
|
|
monkeypatch.setattr(
|
|
s, "mark_job_run",
|
|
lambda jid, ok, err=None, delivery_error=None: marks.append((jid, ok)),
|
|
)
|
|
|
|
ok = s.run_one_job({"id": "j6", "name": "t"})
|
|
|
|
assert ok is False
|
|
assert marks == [("j6", False)]
|