mirror of
https://github.com/rennf93/roboco.git
synced 2026-08-03 07:23:24 +02:00
* feat(forge): Phase 2 — Gitea provider, per-call routing, host registry Gitea support lands behind the Phase-1 seam: - GiteaProvider (services/forge/gitea.py): Gitea v1 transport addressed by instance host (api base from the project's git_url). Where Gitea's wire contract diverges from GitHub's, the provider adapts responses back into the shapes GitService already classifies (ShapedResponse): `token` auth scheme, duplicate-PR 409→422 with the "already exists" text GitService keys on, commit statuses reshaped into check_runs / workflow_runs envelopes, APPROVE→APPROVED review mapping, Do-keyed POST merge, merge-method repo keys, label-color '#' prefix, client-side head/base PR filtering. Deliberate postures per the spec: zero-workflows fail-open (statuses-free repo → no_ci_configured) and merge_branch as a shaped 501 (env-sync cascade lands on missing_ref; the shared local-git fallback is Phase-2.1). - ForgeRouter (services/forge/router.py): GitService._forge now routes per call from RepoRef.host — every existing call site unchanged in shape. RepoRef gains an optional host; _parse_git_url returns the host-stamped ref and it is threaded through GitService/release executor instead of being rebuilt from strings (helpers re-signatured to take RepoRef). - Host registry (services/forge/registry.py): in-memory host→provider map, self-healing — ProjectService.get/get_by_slug re-register on every read; provider_for resolves gitea projects by git_url host. - Registration validation now accepts git_provider="gitea"; GitLab remains recognized-but-rejected. Panel: the read-only Forge badge becomes a real picker (Auto-detect / GitHub-GHE / Gitea / GitLab disabled). Plain git (clone/fetch/push) needs no changes — the Basic-auth extraheader works on Gitea unchanged. Gates: mypy 392 files, xenon A, full unit suite 6356 green, integration suite 2257 green. * feat(forge): live-Gitea contract suite + scheme support + slash-safe refs Hardening from running the provider against a real dockerized Gitea 1.22.6 (the spec's Phase-2 contract suite, now committed as the env-gated tests/e2e_smoke/test_gitea_live.py — self-seeding: creates its own repo, pushes real commits, and drives PR open → duplicate reshape → list/filter → diff → review → labels → commit-status CI reshapes → squash merge → branch delete → release, plus a live verification of the x-access-token Basic-auth git-CLI claim). Two real findings fixed: - Branch refs weren't URL-encoded — every RoboCo branch carries slashes (feature/backend/...), and Gitea's router 404s on the extra path segments. list_ci_runs + delete_branch_ref now quote the ref (regression-pinned in the unit suite). - The API base hardcoded https; a LAN instance serving plain http is a real deployment shape. GiteaProvider gains a scheme (recorded per host by the registry from the project's git_url). ShapedResponse moves to forge/shaping.py (shared by the upcoming GitLab transport, which needs its text override for diff reassembly). * feat(forge): Phase 3 GitLab provider + Phase 2.1 local-merge fallback GitLabProvider (services/forge/gitlab.py): GitLab v4 transport addressed by host+scheme, subgroup-safe (the MR project path packs into RepoRef.owner, URL-encoded per call). Adapters translate MR semantics into the GitHub shapes GitService classifies: iid→number, source/target_branch→head/base with a merged bool, per-file diffs reassembled into unified-diff text (ShapedResponse text override, 3-page cap), approve-vs-note review routing (GitLab has no request-changes verb), pipelines/statuses reshaped into workflow_runs/check_runs, merge-method repo-key mapping, duplicate-MR 409→422. Reviewer mirroring is skipped (needs numeric ids RoboCo doesn't store); provisioning stays Phase 4. gitlab.com now auto-detects at registration like github.com; self-hosted GitLab sets the provider explicitly (panel picker enabled). Phase 2.1: neither Gitea nor GitLab has GitHub's server-side merges API — their merge_branch returns a shaped 501 and GitService.sync_env_branch now runs the shared local-git fallback (_local_merge_branch: throwaway clone → ancestor check → merge → push; a conflict aborts with the remote untouched; same status vocabulary as the merges-API path). Also aligns the whole tree with the full gate's tests/-scoped mypy (provider-test responder typing, e2e_smoke's stale owner/repo shapes). Gates: mypy 1229 files clean, xenon A, unit suite 6393 green, forge suites 85 green, panel typecheck/lint clean. --------- Co-authored-by: Renn F <rennf93@users.noreply.github.com>
106 lines
3.3 KiB
Python
106 lines
3.3 KiB
Python
"""``_merge_with_retry`` treats an already-merged PR as idempotent success.
|
|
|
|
A merge PUT on an already-merged PR returns the same 405 as a genuine
|
|
"not mergeable" conflict. Treating it as a conflict made `cell_pm_complete`
|
|
try to rebase/escalate a PR that had already landed — the block<->unblock
|
|
respawn loop. The merge path now disambiguates: already-merged → success
|
|
(no-op), otherwise a real `MergeConflictError`.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
from pathlib import Path
|
|
from typing import Any
|
|
from unittest.mock import AsyncMock, MagicMock, patch
|
|
|
|
import pytest
|
|
from roboco.exceptions import MergeConflictError
|
|
from roboco.services.forge import RepoRef
|
|
from roboco.services.git import GitService
|
|
|
|
|
|
def _git_service() -> GitService:
|
|
svc = GitService.__new__(GitService)
|
|
svc.log = MagicMock()
|
|
return svc
|
|
|
|
|
|
def _resp(status_code: int, *, is_success: bool) -> Any:
|
|
return type(
|
|
"R",
|
|
(),
|
|
{
|
|
"status_code": status_code,
|
|
"is_success": is_success,
|
|
"text": "",
|
|
"json": lambda _self=None: {},
|
|
},
|
|
)()
|
|
|
|
|
|
def _ctx() -> Any:
|
|
return GitService._MergeContext(
|
|
repo_ref=RepoRef("acme", "repo"),
|
|
pr_number=42,
|
|
git_token="tok",
|
|
workspace=Path("/ws"),
|
|
target="feature/main_pm/abc",
|
|
)
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_merge_idempotent_when_pr_already_merged(
|
|
monkeypatch: pytest.MonkeyPatch,
|
|
) -> None:
|
|
svc = _git_service()
|
|
monkeypatch.setattr(
|
|
svc, "_call_merge_api", AsyncMock(return_value=_resp(405, is_success=False))
|
|
)
|
|
already = AsyncMock(return_value=True)
|
|
monkeypatch.setattr(svc, "_pr_is_merged", already)
|
|
|
|
# Must NOT raise — an already-merged PR is a no-op success.
|
|
await svc._merge_with_retry(_ctx())
|
|
|
|
already.assert_awaited_once()
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_merge_raises_conflict_when_not_already_merged(
|
|
monkeypatch: pytest.MonkeyPatch,
|
|
) -> None:
|
|
svc = _git_service()
|
|
monkeypatch.setattr(
|
|
svc, "_call_merge_api", AsyncMock(return_value=_resp(405, is_success=False))
|
|
)
|
|
monkeypatch.setattr(svc, "_pr_is_merged", AsyncMock(return_value=False))
|
|
|
|
with pytest.raises(MergeConflictError):
|
|
await svc._merge_with_retry(_ctx())
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_pr_is_merged_true_when_github_reports_merged() -> None:
|
|
svc = _git_service()
|
|
resp = type(
|
|
"R", (), {"is_success": True, "json": lambda _self=None: {"merged": True}}
|
|
)()
|
|
client = MagicMock()
|
|
client.__aenter__ = AsyncMock(return_value=client)
|
|
client.__aexit__ = AsyncMock(return_value=False)
|
|
client.get = AsyncMock(return_value=resp)
|
|
with patch("roboco.services.git.httpx.AsyncClient", return_value=client):
|
|
assert await svc._pr_is_merged(RepoRef("acme", "repo"), 42, "tok") is True
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_pr_is_merged_false_on_non_success() -> None:
|
|
svc = _git_service()
|
|
resp = type("R", (), {"is_success": False, "json": lambda _self=None: {}})()
|
|
client = MagicMock()
|
|
client.__aenter__ = AsyncMock(return_value=client)
|
|
client.__aexit__ = AsyncMock(return_value=False)
|
|
client.get = AsyncMock(return_value=resp)
|
|
with patch("roboco.services.git.httpx.AsyncClient", return_value=client):
|
|
assert await svc._pr_is_merged(RepoRef("acme", "repo"), 42, "tok") is False
|