Files
roboco/tests/unit/services/test_git_merge_method_fallback.py
T
Renn F 3d9dd29848 fix(git): fall back on merge-method and PR-base when the repo/remote refuses
Two completion-stranding fixes, reimplemented on current master from
CoreyRDean's #120 and #121:

- merge_pull_request: on a 405 (repo disallows the requested merge method — e.g.
  squash merges turned off in repo settings), look up a permitted method
  (_first_allowed_merge_method, preferring squash > merge > rebase) and retry
  once. A repo's merge-button config can no longer permanently wedge the PM on
  an open, mergeable PR. No behavior change when the requested method is allowed.
- create_pull_request: if the resolved PR base branch is missing on origin (an
  ancestor task claimed but never pushed -> GitHub 422 "base field invalid"),
  ls-remote the base and retarget to the project default branch
  (_pr_base_on_remote), mirroring the existing create_branch fallback. No
  behavior change when the base exists.

Both funnel through the central git paths so every caller benefits. Adds unit
tests for both fallbacks.
2026-06-15 07:03:59 +02:00

163 lines
4.9 KiB
Python

"""GitService falls back to a permitted merge method when the repo refuses one.
A repo with squash merges disabled returns 405 ("Squash merges are not allowed")
on the default squash merge. Without a fallback the PM strands on an open,
mergeable PR — code built, QA passed, docs written, one API call from done.
merge_pull_request must look up a method the repo permits and retry once.
"""
from __future__ import annotations
from pathlib import Path
from typing import Any
from unittest.mock import AsyncMock, MagicMock
import pytest
import roboco.services.git as git_module
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, json_data: dict[str, Any] | None = None
) -> Any:
payload = json_data or {}
return type(
"R",
(),
{
"status_code": status_code,
"is_success": is_success,
"text": "",
"json": lambda _self=None, _p=payload: _p,
},
)()
class _FakeClient:
def __init__(self, resp: Any) -> None:
self._resp = resp
async def __aenter__(self) -> _FakeClient:
return self
async def __aexit__(self, *_a: Any) -> bool:
return False
async def get(self, _url: str, **_kwargs: Any) -> Any:
return self._resp
@pytest.mark.asyncio
async def test_first_allowed_skips_disabled_method(
monkeypatch: pytest.MonkeyPatch,
) -> None:
svc = _git_service()
resp = _resp(
200,
is_success=True,
json_data={
"allow_squash_merge": False,
"allow_merge_commit": True,
"allow_rebase_merge": True,
},
)
monkeypatch.setattr(
git_module.httpx, "AsyncClient", lambda *_a, **_k: _FakeClient(resp)
)
method = await svc._first_allowed_merge_method("o", "r", "tok", exclude="squash")
assert method == "merge" # squash disabled + excluded -> next permitted
@pytest.mark.asyncio
async def test_first_allowed_returns_none_when_lookup_fails(
monkeypatch: pytest.MonkeyPatch,
) -> None:
svc = _git_service()
resp = _resp(403, is_success=False)
monkeypatch.setattr(
git_module.httpx, "AsyncClient", lambda *_a, **_k: _FakeClient(resp)
)
assert await svc._first_allowed_merge_method("o", "r", "tok") is None
@pytest.mark.asyncio
async def test_merge_retries_with_allowed_method_on_405(
monkeypatch: pytest.MonkeyPatch,
) -> None:
svc = _git_service()
monkeypatch.setattr(
svc, "_get_project_token_or_raise", AsyncMock(return_value="tok")
)
monkeypatch.setattr(svc, "_parse_github_remote", lambda _ws: ("owner", "repo"))
monkeypatch.setattr(
svc, "_delete_pr_branch_best_effort", AsyncMock(return_value=None)
)
monkeypatch.setattr(
svc, "_project_default_branch", AsyncMock(return_value="master")
)
monkeypatch.setattr(svc, "_sync_target_branch", AsyncMock(return_value="abc123"))
monkeypatch.setattr(
svc, "_first_allowed_merge_method", AsyncMock(return_value="merge")
)
calls: list[str] = []
async def fake_call(
_owner: str, _repo: str, _pr: int, _token: str, method: str
) -> Any:
calls.append(method)
return (
_resp(200, is_success=True)
if method == "merge"
else _resp(405, is_success=False)
)
monkeypatch.setattr(svc, "_call_merge_api", fake_call)
target, commit = await svc.merge_pull_request(Path("/tmp/ws"), 7, "squash", "proj")
assert calls == ["squash", "merge"] # refused squash, retried with merge
assert target == "master"
assert commit == "abc123"
@pytest.mark.asyncio
async def test_merge_does_not_retry_when_method_allowed(
monkeypatch: pytest.MonkeyPatch,
) -> None:
svc = _git_service()
monkeypatch.setattr(
svc, "_get_project_token_or_raise", AsyncMock(return_value="tok")
)
monkeypatch.setattr(svc, "_parse_github_remote", lambda _ws: ("owner", "repo"))
monkeypatch.setattr(
svc, "_delete_pr_branch_best_effort", AsyncMock(return_value=None)
)
monkeypatch.setattr(
svc, "_project_default_branch", AsyncMock(return_value="master")
)
monkeypatch.setattr(svc, "_sync_target_branch", AsyncMock(return_value="abc123"))
lookup = AsyncMock(return_value="merge")
monkeypatch.setattr(svc, "_first_allowed_merge_method", lookup)
calls: list[str] = []
async def fake_call(
_owner: str, _repo: str, _pr: int, _token: str, method: str
) -> Any:
calls.append(method)
return _resp(200, is_success=True)
monkeypatch.setattr(svc, "_call_merge_api", fake_call)
await svc.merge_pull_request(Path("/tmp/ws"), 7, "squash", "proj")
assert calls == ["squash"] # allowed first time, no second call
lookup.assert_not_awaited() # fallback lookup never triggered