mirror of
https://github.com/rennf93/roboco.git
synced 2026-08-03 07:23:24 +02:00
[w4] Label every fleet PR with its org-structure role (#526)
Pure derive_pr_labels (foundation/policy/pr_labels.py) maps a PR's shape
to a stable org-structure label set: to master/to slave (is_root_pr
discriminator), root, MegaTask, and the owning layer (main-pm /
cell/{team} / subtask/{team}). Mirrors batch.py: object|None inputs,
enum-or-string normalization, no DB/I/O. Full slave-targeting semantics
(base_branch vs default_branch) land with the slave/master wiring (W-H);
YAGNI now.
GitService._apply_pr_labels posts the result to the GitHub labels API
best-effort (create-before-add, swallow 422/409, never raises) so a label
failure can never block PR creation. Wired at all three PR-opening sites:
create_pr (gateway path), create_pull_request (REST/task path), and
_push_and_open_conventions_pr (static chore label). Existing PR tests
mock _apply_pr_labels so they never hit the real labels API.
Co-authored-by: Renn F <rennf93@users.noreply.github.com>
This commit is contained in:
@@ -4,6 +4,7 @@ from __future__ import annotations
|
||||
|
||||
import subprocess
|
||||
from typing import TYPE_CHECKING, Any
|
||||
from unittest.mock import AsyncMock
|
||||
from uuid import uuid4
|
||||
|
||||
from roboco.config import settings
|
||||
@@ -158,6 +159,7 @@ async def test_open_conventions_pr_force_pushes_scaffold_branch(
|
||||
return _Resp()
|
||||
|
||||
monkeypatch.setattr(git, "_post_pr", _fake_post_pr)
|
||||
monkeypatch.setattr(git, "_apply_pr_labels", AsyncMock())
|
||||
|
||||
spec = _ConventionsPr(
|
||||
content="version: 1\n",
|
||||
|
||||
@@ -0,0 +1,100 @@
|
||||
"""Pure derivation matrix for ``derive_pr_labels`` — no DB, no I/O."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from uuid import uuid4
|
||||
|
||||
from roboco.foundation.identity import Team
|
||||
from roboco.foundation.policy.pr_labels import (
|
||||
CONVENTIONS_PR_LABELS,
|
||||
derive_pr_labels,
|
||||
)
|
||||
|
||||
|
||||
def test_root_master_megatask_main_pm() -> None:
|
||||
# submit_root on a MegaTask root-subtask: root->master, main_pm, batch member.
|
||||
labels = derive_pr_labels(
|
||||
is_root_pr=True,
|
||||
task_team=Team.MAIN_PM,
|
||||
batch_id=uuid4(),
|
||||
has_children=True,
|
||||
)
|
||||
assert labels == ["to master", "root", "MegaTask", "main-pm"]
|
||||
|
||||
|
||||
def test_root_master_main_pm_no_batch() -> None:
|
||||
labels = derive_pr_labels(
|
||||
is_root_pr=True,
|
||||
task_team=Team.MAIN_PM,
|
||||
batch_id=None,
|
||||
has_children=True,
|
||||
)
|
||||
assert labels == ["to master", "root", "main-pm"]
|
||||
|
||||
|
||||
def test_cell_to_root_assembled() -> None:
|
||||
# submit_up: cell->root PR, base is the integration branch (not default).
|
||||
labels = derive_pr_labels(
|
||||
is_root_pr=False,
|
||||
task_team=Team.BACKEND,
|
||||
batch_id=None,
|
||||
has_children=True,
|
||||
)
|
||||
assert labels == ["to slave", "cell/backend"]
|
||||
|
||||
|
||||
def test_leaf_dev_pr() -> None:
|
||||
labels = derive_pr_labels(
|
||||
is_root_pr=False,
|
||||
task_team=Team.FRONTEND,
|
||||
batch_id=None,
|
||||
has_children=False,
|
||||
)
|
||||
assert labels == ["to slave", "subtask/frontend"]
|
||||
|
||||
|
||||
def test_freeform_pr_no_task() -> None:
|
||||
# task_id None: no team, no batch — just the tree + root flags.
|
||||
labels = derive_pr_labels(
|
||||
is_root_pr=False,
|
||||
task_team=None,
|
||||
batch_id=None,
|
||||
has_children=False,
|
||||
)
|
||||
assert labels == ["to slave"]
|
||||
|
||||
|
||||
def test_freeform_root_pr_no_task() -> None:
|
||||
labels = derive_pr_labels(
|
||||
is_root_pr=True,
|
||||
task_team=None,
|
||||
batch_id=None,
|
||||
has_children=False,
|
||||
)
|
||||
assert labels == ["to master", "root"]
|
||||
|
||||
|
||||
def test_accepts_string_team_value() -> None:
|
||||
# callers pass ORM enum members OR their .value strings (mirrors batch.py).
|
||||
labels = derive_pr_labels(
|
||||
is_root_pr=False,
|
||||
task_team="main_pm",
|
||||
batch_id=None,
|
||||
has_children=True,
|
||||
)
|
||||
assert labels == ["to slave", "main-pm"]
|
||||
|
||||
|
||||
def test_conventions_pr_labels_static() -> None:
|
||||
assert CONVENTIONS_PR_LABELS == ["chore"]
|
||||
|
||||
|
||||
def test_no_duplicates() -> None:
|
||||
# a shape that could repeat a label still yields a unique list.
|
||||
labels = derive_pr_labels(
|
||||
is_root_pr=True,
|
||||
task_team=Team.MAIN_PM,
|
||||
batch_id=uuid4(),
|
||||
has_children=True,
|
||||
)
|
||||
assert len(labels) == len(set(labels))
|
||||
@@ -503,6 +503,7 @@ async def test_create_pr_returns_pr_dict() -> None:
|
||||
"html_url": f"https://github.com/acme/repo/pull/{_EXPECTED_PR_NUMBER}",
|
||||
}
|
||||
_bind(svc, "_post_pr", AsyncMock(return_value=fake_resp))
|
||||
_bind(svc, "_apply_pr_labels", AsyncMock())
|
||||
|
||||
with _patch_project_service(fake_project):
|
||||
out = await svc.create_pr(
|
||||
@@ -550,6 +551,7 @@ async def test_create_pr_records_pr_despite_cancellation_after_post() -> None:
|
||||
"html_url": f"https://github.com/acme/repo/pull/{_EXPECTED_PR_NUMBER}",
|
||||
}
|
||||
_bind(svc, "_post_pr", AsyncMock(return_value=fake_resp))
|
||||
_bind(svc, "_apply_pr_labels", AsyncMock())
|
||||
|
||||
with _patch_project_service(fake_project):
|
||||
task = asyncio.ensure_future(
|
||||
@@ -607,6 +609,7 @@ async def test_create_pr_cancellation_waits_out_record_before_reraising() -> Non
|
||||
"html_url": f"https://github.com/acme/repo/pull/{_EXPECTED_PR_NUMBER}",
|
||||
}
|
||||
_bind(svc, "_post_pr", AsyncMock(return_value=fake_resp))
|
||||
_bind(svc, "_apply_pr_labels", AsyncMock())
|
||||
|
||||
with _patch_project_service(fake_project):
|
||||
task = asyncio.ensure_future(
|
||||
|
||||
Reference in New Issue
Block a user