mirror of
https://github.com/boykopovar/AnyPS5.git
synced 2026-10-28 12:05:06 +00:00
JaceTheBluandClaude Opus 5.5
f53ee43a43
Both tools merge with git merge-tree --write-tree, which needs git 2.38, and pr_overlap's pairwise merges also pass --merge-base, which needs git 2.40. On an older git, such as 2.34 on Ubuntu 22.04, they stopped with git's merge-tree usage text and nothing said what was wrong. A failing merge now reports the version it needs and the one found when git is older; on a recent enough git the error is unchanged. Co-Authored-By: Claude Opus 5.5 <[email protected]>
83 lines
3.5 KiB
Python
83 lines
3.5 KiB
Python
import runpy
|
|
import subprocess
|
|
import sys
|
|
import unittest
|
|
from pathlib import Path
|
|
from unittest.mock import patch
|
|
|
|
sys.path.insert(0, str(Path(__file__).resolve().parents[1]))
|
|
import pr_overlap
|
|
|
|
SCRIPT = Path(pr_overlap.__file__)
|
|
MISSING_REF = "fatal: couldn't find remote ref refs/heads/upstream/main"
|
|
|
|
|
|
def fake_run(command, **kwargs):
|
|
if command[0] == "gh":
|
|
return subprocess.CompletedProcess(command, 0, stdout="[]", stderr="")
|
|
return subprocess.CompletedProcess(command, 128, stdout=b"", stderr=MISSING_REF.encode())
|
|
|
|
|
|
class ErrorReportTests(unittest.TestCase):
|
|
def test_failure_names_the_command_the_exit_code_and_the_git_message(self):
|
|
error = subprocess.CalledProcessError(128, ["git", "fetch", "-q"], output="", stderr=MISSING_REF + "\n")
|
|
message = pr_overlap.describe_failure(error)
|
|
self.assertEqual(message, "pr_overlap: git fetch -q failed with exit code 128: " + MISSING_REF)
|
|
|
|
def test_failure_without_output_says_so(self):
|
|
error = subprocess.CalledProcessError(1, ["gh", "api"], output="", stderr="")
|
|
self.assertEqual(pr_overlap.describe_failure(error), "pr_overlap: gh api failed with exit code 1: no error output")
|
|
|
|
def test_unknown_base_branch_exits_with_the_git_message_instead_of_a_traceback(self):
|
|
argv = ["pr_overlap.py", "--repo", "owner/project", "--base", "upstream/main", "--branch", "HEAD"]
|
|
with patch.object(subprocess, "run", side_effect=fake_run), patch.object(sys, "argv", argv):
|
|
with self.assertRaises(SystemExit) as raised:
|
|
runpy.run_path(str(SCRIPT), run_name="__main__")
|
|
self.assertIn("exit code 128", str(raised.exception.code))
|
|
self.assertIn(MISSING_REF, str(raised.exception.code))
|
|
|
|
def test_merge_on_old_git_names_the_version_it_needs(self):
|
|
def old_git(command, **kwargs):
|
|
if "version" in command:
|
|
return subprocess.CompletedProcess(command, 0, stdout=b"git version 2.39.5\n", stderr=b"")
|
|
if "rev-parse" in command:
|
|
return subprocess.CompletedProcess(command, 0, stdout=b"/repo\n", stderr=b"")
|
|
return subprocess.CompletedProcess(command, 129, stdout=b"", stderr=b"error: unknown option")
|
|
|
|
with patch.object(subprocess, "run", side_effect=old_git), patch.dict(pr_overlap._REPO_ROOTS, clear=True):
|
|
with self.assertRaisesRegex(RuntimeError, r"needs git 2\.40 or newer; this git is 2\.39$"):
|
|
pr_overlap.merge("--merge-base=refs/pr/base", "a", "b")
|
|
with self.assertRaisesRegex(RuntimeError, r"failed: error: unknown option$"):
|
|
pr_overlap.merge("refs/pr/base", "a")
|
|
|
|
def test_main_reconfigures_streams(self):
|
|
class Stream:
|
|
def __init__(self):
|
|
self.encoding = None
|
|
self.errors = None
|
|
|
|
def reconfigure(self, encoding=None, errors=None):
|
|
self.encoding = encoding
|
|
self.errors = errors
|
|
|
|
def write(self, text):
|
|
pass
|
|
|
|
def flush(self):
|
|
pass
|
|
|
|
out, err = Stream(), Stream()
|
|
with patch.object(pr_overlap.sys, "stdout", out), patch.object(pr_overlap.sys, "stderr", err):
|
|
try:
|
|
pr_overlap.main([])
|
|
except SystemExit:
|
|
pass
|
|
self.assertEqual(out.encoding, "utf-8")
|
|
self.assertEqual(out.errors, "backslashreplace")
|
|
self.assertEqual(err.encoding, "utf-8")
|
|
self.assertEqual(err.errors, "backslashreplace")
|
|
|
|
|
|
if __name__ == "__main__":
|
|
unittest.main()
|