pelmen/kin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

kin: auto-commit after pipeline

Browse source
This commit is contained in:
Gros Frumos 2026-03-17 23:31:24 +02:00
parent 95ba853b49
commit 24996b3974
4 changed files with 77 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

11
tests/test_kin_091_regression.py
View file

@ -507,7 +507,11 @@ class TestMergeWorktree:
merge_ok = MagicMock(returncode=0, stdout="", stderr="")
diff_ok = MagicMock(returncode=0, stdout="src/api.py\nsrc/models.py\n", stderr="")
with patch("core.worktree.subprocess.run", side_effect=[merge_ok, diff_ok]):
add_ok = MagicMock(returncode=0, stdout="", stderr="")
commit_ok = MagicMock(returncode=0, stdout="", stderr="")
# Fix B adds git add -A + git commit before merge
with patch("core.worktree.subprocess.run",
side_effect=[add_ok, commit_ok, merge_ok, diff_ok]):
result = merge_worktree(worktree, str(tmp_path))
assert result["success"] is True
@ -523,8 +527,11 @@ class TestMergeWorktree:
conflict_files = MagicMock(returncode=0, stdout="src/models.py\n", stderr="")
abort = MagicMock(returncode=0)
add_ok = MagicMock(returncode=0, stdout="", stderr="")
commit_ok = MagicMock(returncode=0, stdout="", stderr="")
# Fix B adds git add -A + git commit before merge
with patch("core.worktree.subprocess.run",
side_effect=[merge_fail, conflict_files, abort]):
side_effect=[add_ok, commit_ok, merge_fail, conflict_files, abort]):
result = merge_worktree(worktree, str(tmp_path))
assert result["success"] is False