didericis/bot-bottle
1
0
Fork 0
Code Issues 32 Pull Requests 9 Actions Packages Releases Wiki Activity

fix(manifest): avoid KeyError when override bottle has repos absent from base #464

Merged
didericis merged 2 commits from fix/457-merge-bottles-git-repo-keyerror into main 2026-07-23 18:33:01 -04:00
Conversation 2 Commits 2 Files Changed 2
+8 -7
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f3437528d6 - Show all commits
tests/unit/test_manifest_bottle_merge.py
+8 -7
View File
@@ -25,6 +25,10 @@ def _bottle(**kwargs: object) -> ManifestBottle:
return ManifestBottle.from_dict("test", kwargs)
def _git_repo(url: str) -> dict[str, object]:
return {"url": url, "key": {"provider": "gitea", "forge_token_env": "TOK"}}
class TestMergeBottlesRuntime(unittest.TestCase):
def test_single_bottle_returns_as_is(self):
b = _bottle(env={"FOO": "1"})
@@ -118,23 +122,20 @@ class TestMergeBottlesRuntime(unittest.TestCase):
def test_git_repo_only_in_override_does_not_raise(self):
# Regression for issue #457: override bottle declares a repo that the
# base doesn't have → KeyError on base_repos_by_name[n].
_repo = lambda url: {"url": url, "key": {"provider": "gitea", "forge_token_env": "TOK"}}
base = _bottle(env={"X": "base"})
override = _bottle(**{"git-gate": {"repos": {"myrepo": _repo("ssh://git@example.com/repo.git")}}})
override = _bottle(**{"git-gate": {"repos": {"myrepo": _git_repo("ssh://git@example.com/repo.git")}}})
result = merge_bottles_runtime([base, override])
self.assertIn("myrepo", [e.Name for e in result.git])
def test_git_repo_only_in_base_survives_override(self):
_repo = lambda url: {"url": url, "key": {"provider": "gitea", "forge_token_env": "TOK"}}
base = _bottle(**{"git-gate": {"repos": {"myrepo": _repo("ssh://git@example.com/repo.git")}}})
base = _bottle(**{"git-gate": {"repos": {"myrepo": _git_repo("ssh://git@example.com/repo.git")}}})
override = _bottle(env={"X": "override"})
result = merge_bottles_runtime([base, override])
self.assertIn("myrepo", [e.Name for e in result.git])
def test_git_repo_override_wins_by_name(self):
_repo = lambda url: {"url": url, "key": {"provider": "gitea", "forge_token_env": "TOK"}}
base = _bottle(**{"git-gate": {"repos": {"myrepo": _repo("ssh://git@base.example.com/repo.git")}}})
override = _bottle(**{"git-gate": {"repos": {"myrepo": _repo("ssh://git@override.example.com/repo.git")}}})
base = _bottle(**{"git-gate": {"repos": {"myrepo": _git_repo("ssh://git@base.example.com/repo.git")}}})
override = _bottle(**{"git-gate": {"repos": {"myrepo": _git_repo("ssh://git@override.example.com/repo.git")}}})
result = merge_bottles_runtime([base, override])
self.assertEqual(1, len(result.git))
self.assertEqual("ssh://git@override.example.com/repo.git", result.git[0].Upstream)