mirror of
https://github.com/rennf93/roboco.git
synced 2026-08-03 07:23:24 +02:00
The pr_pass (reviewer) conventions guard reused the dev-path block-finding remediation: 'add a waiver to .roboco/conventions.yml in your branch'. A pr_reviewer does not own the assembled cell->root / root->master branch and has no commit verb on it, so the waiver remediation is unreachable — a false positive stranded the gate with no self-recovery (the reviewer could neither commit a waiver nor pr_pass). The fail-open content path is documented precision-over-recall and stays as-is; the actionable gap is the remediation. Fix: _conventions_rejection now branches the block-finding remediation on reviewer=True (mirroring the could_not_run branch from F044). The reviewer path points at pr_fail carrying the findings as issues so the PR returns to needs_revision and the DEV fixes the violation or commits the waiver (the dev CAN commit to the branch); waiver authorship is framed as the dev's action, not the reviewer's. Dev i_am_done path wording unchanged. TDD test_conventions_gate_pr_pass.py (+1).
130 lines
5.0 KiB
Python
130 lines
5.0 KiB
Python
"""The pr_pass conventions gate: a reviewer can't PASS a PR with block violations.
|
|
|
|
``_gate_decision`` runs ``_conventions_guard`` for ``verb == "pr_pass"`` only
|
|
(pr_fail stays available), exactly like the toolchain guard. These exercise the
|
|
shared guard the pr_pass path invokes: a ``block`` finding (or a validator that
|
|
could not run) refuses; ``warn`` passes; flag-off is inert.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
from typing import Any
|
|
from unittest.mock import AsyncMock, MagicMock
|
|
from uuid import uuid4
|
|
|
|
import pytest
|
|
from roboco.config import settings
|
|
from roboco.services.gateway.choreographer import Choreographer, ChoreographerDeps
|
|
|
|
_BLOCK_RESULT: dict[str, Any] = {
|
|
"findings": [
|
|
{
|
|
"file": "app/routers/u.py",
|
|
"line": 2,
|
|
"level": "block",
|
|
"fix_hint": "move it into models/",
|
|
}
|
|
],
|
|
"could_not_run": False,
|
|
}
|
|
|
|
|
|
def _make_choreographer(*, check_result: dict[str, Any]) -> Choreographer:
|
|
base: dict[str, Any] = {
|
|
"task": AsyncMock(),
|
|
"work_session": AsyncMock(),
|
|
"git": AsyncMock(),
|
|
"a2a": AsyncMock(),
|
|
"journal": AsyncMock(),
|
|
"audit": AsyncMock(),
|
|
"evidence_repo": AsyncMock(),
|
|
}
|
|
base["git"].conventions_check_for_task.return_value = check_result
|
|
return Choreographer(ChoreographerDeps(**base))
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_pr_pass_guard_blocks_on_block_finding(
|
|
monkeypatch: pytest.MonkeyPatch,
|
|
) -> None:
|
|
monkeypatch.setattr(settings, "conventions_enabled", True)
|
|
c = _make_choreographer(check_result=_BLOCK_RESULT)
|
|
env = await c._conventions_guard(uuid4(), MagicMock(), {})
|
|
assert env is not None
|
|
body = env.as_dict()
|
|
assert body["error"] == "invalid_state"
|
|
assert "app/routers/u.py:2" in body["remediate"]
|
|
assert "waiver" in body["remediate"]
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_pr_pass_guard_allows_warn(monkeypatch: pytest.MonkeyPatch) -> None:
|
|
monkeypatch.setattr(settings, "conventions_enabled", True)
|
|
c = _make_choreographer(
|
|
check_result={
|
|
"findings": [{"file": "x.py", "line": 1, "level": "warn", "fix_hint": "h"}],
|
|
"could_not_run": False,
|
|
}
|
|
)
|
|
assert await c._conventions_guard(uuid4(), MagicMock(), {}) is None
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_pr_pass_guard_blocks_when_validator_cannot_run(
|
|
monkeypatch: pytest.MonkeyPatch,
|
|
) -> None:
|
|
monkeypatch.setattr(settings, "conventions_enabled", True)
|
|
c = _make_choreographer(check_result={"findings": [], "could_not_run": True})
|
|
assert await c._conventions_guard(uuid4(), MagicMock(), {}) is not None
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_pr_pass_guard_could_not_run_remediation_uses_pr_fail(
|
|
monkeypatch: pytest.MonkeyPatch,
|
|
) -> None:
|
|
# F044: _conventions_guard is the pr_pass (reviewer) path. A reviewer has no
|
|
# i_am_blocked verb, so the could_not_run remediation must point at pr_fail
|
|
# (the reviewer's reject lever) — not tell them to call a verb they lack.
|
|
monkeypatch.setattr(settings, "conventions_enabled", True)
|
|
c = _make_choreographer(check_result={"findings": [], "could_not_run": True})
|
|
env = await c._conventions_guard(uuid4(), MagicMock(), {})
|
|
assert env is not None
|
|
body = env.as_dict()
|
|
assert "i_am_blocked" not in body["remediate"]
|
|
assert "pr_fail" in body["remediate"]
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_pr_pass_guard_block_remediation_uses_pr_fail_not_reviewer_waiver(
|
|
monkeypatch: pytest.MonkeyPatch,
|
|
) -> None:
|
|
# F047: on the pr_pass (reviewer) path a block-level finding's remediation
|
|
# must point at pr_fail (the reviewer's only lever) and frame the waiver as
|
|
# the DEV's action — NOT tell the reviewer to "add a waiver to
|
|
# .roboco/conventions.yml in your branch". A pr_reviewer does not own the
|
|
# assembled cell→root / root→master branch and has no commit verb on it, so
|
|
# the shared dev-path waiver remediation is unreachable and would strand the
|
|
# gate on every false positive (no self-recovery).
|
|
monkeypatch.setattr(settings, "conventions_enabled", True)
|
|
c = _make_choreographer(check_result=_BLOCK_RESULT)
|
|
env = await c._conventions_guard(uuid4(), MagicMock(), {})
|
|
assert env is not None
|
|
body = env.as_dict()
|
|
remediate = body["remediate"]
|
|
# The reviewer's lever is pr_fail, not committing a waiver themselves.
|
|
assert "pr_fail" in remediate
|
|
# The offending finding is carried so the reviewer can paste it as an issue.
|
|
assert "app/routers/u.py:2" in remediate
|
|
# The reviewer must NOT be told to add a waiver "in your branch" — they
|
|
# can't commit to the assembled PR branch. The waiver is the dev's job.
|
|
assert "in your branch" not in remediate
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_pr_pass_guard_inert_when_flag_off(
|
|
monkeypatch: pytest.MonkeyPatch,
|
|
) -> None:
|
|
monkeypatch.setattr(settings, "conventions_enabled", False)
|
|
c = _make_choreographer(check_result=_BLOCK_RESULT)
|
|
assert await c._conventions_guard(uuid4(), MagicMock(), {}) is None
|