Test who merges at each default, a failed ready mark, the worker's sentence and an unreadable config
CI / tests (pull_request) Failing after 4m43s
CI / tests (pull_request) Failing after 4m43s
This commit is contained in:
@@ -12,6 +12,7 @@ import unittest
|
||||
sys.path.insert(0, str(pathlib.Path(__file__).resolve().parents[1]))
|
||||
|
||||
from chunk_pr.main import cleaned, merged, QUEUE, step, turn, USAGE
|
||||
from chunk_pr.approval import awaited
|
||||
from failure import Failure
|
||||
from test_env import isolated_env
|
||||
from project_config.settings import ProjectConfig
|
||||
@@ -395,6 +396,15 @@ class Merge(unittest.TestCase):
|
||||
self.assertIn("awaits a person's merge", str(step(["merge"], checkout, checkout.config)))
|
||||
self.assertNotIn(GH_DECISION, checkout.ran)
|
||||
|
||||
def test_merge_waits_for_no_approval_where_a_person_merges_and_for_the_configs_otherwise(self):
|
||||
self.assertEqual([awaited("gh", True, True), awaited("tea", True, True), awaited("gh", True), awaited("gh", False)], [False, False, True, False])
|
||||
self.assertIsInstance(awaited("tea", True), Failure)
|
||||
|
||||
def test_under_a_humans_merge_a_pull_request_that_cannot_be_marked_ready_fails_saying_why(self):
|
||||
checkout = self.merged_by_a_human()
|
||||
checkout.answers[("gh", "pr", "ready", "12")] = Failure("gh pr ready failed")
|
||||
self.assertEqual(step(["merge"], checkout, checkout.config), Failure("gh pr ready failed"))
|
||||
|
||||
def test_under_a_humans_merge_the_plan_items_are_finished_on_the_branch_so_they_land_with_the_merge(self):
|
||||
checkout = self.merged_by_a_human()
|
||||
done = step(["merge", "--finish", "7", "--no-changelog"], checkout, checkout.config)
|
||||
|
||||
@@ -78,6 +78,7 @@ class GateOfAChunk(unittest.TestCase):
|
||||
with self.subTest(forge.answers["git remote"]):
|
||||
self.assertEqual(forge.gate(by_human=True), Gate("/code/billing-ABC-21", "7", MERGE))
|
||||
self.assertEqual(MERGE, "your merge")
|
||||
self.assertEqual(gate("ABC-21", "/code/billing", Forge(decision="APPROVED").at), Open("pull request #7 passed its checks and is approved"))
|
||||
|
||||
def test_where_a_person_merges_every_other_gate_and_all_news_stay_as_they_are(self):
|
||||
same = (Forge(), Forge(buckets=("pending",)), Forge(draft=True), Forge(decision="CHANGES_REQUESTED"), Forge(threads=(thread(False, "reviewer"),)), Forge(buckets=("fail",)), Forge(pulls=""))
|
||||
|
||||
@@ -691,12 +691,23 @@ class AChunkWhosePullRequestWaitsOnAGate(DoEpicTest):
|
||||
code, out, err, prompts = self.parked_run(fake)
|
||||
self.assertEqual(code, 0, err)
|
||||
self.assertIn("parked: pull request #7 awaits an approval\nstarted ABC-22\nparked: pull request #7 awaits your merge\n", out)
|
||||
self.assertIn("leaves the pull request ready for a person to merge", prompts[0])
|
||||
self.assertEqual(out.count("parked: "), 2)
|
||||
self.assertIn("so run `chunk-pr merge` without `--finish`. The repo's team merges its pull requests itself, so `chunk-pr merge` leaves the pull request ready for a person to merge: end your run when it says so. Where the repo publishes", prompts[0])
|
||||
self.assertTrue(prompts[1].startswith(f"do-epic parked the chunk while its pull request awaited your merge. It resumes now: no pull request from origin's ABC-20 is open at abcabcabcabc; it may be merged or closed already. {chunk_prompt.FEEDBACK}\n\n"), prompts[1])
|
||||
self.assertIn("Where the pull request is merged, run `chunk-pr clean`", chunk_prompt.FEEDBACK)
|
||||
self.assertEqual([args[3] for args in fake.tmux_calls if args[0] == "rename-window"], ["ABC-20 awaits an approval", "ABC-20 awaits your merge", "ABC-20"])
|
||||
self.assertFalse(self.file.exists())
|
||||
|
||||
def test_stops_where_the_repos_config_cannot_be_read_as_the_cycle_ends(self) -> None:
|
||||
self.forges = [awaiting()]
|
||||
fake = FakeEffects(streams=[self.worker()], claude=[judged("unfinished")], git=UNREAD, windows=PARKED_WINDOW)
|
||||
broken = self.repo_config.read_text(encoding="utf-8") + 'merge = "nobody"\n'
|
||||
fake.effects = lambda made=fake.effects(): dataclasses.replace(made, stream_claude=lambda *args, **kwargs: (self.repo_config.write_text(broken, encoding="utf-8"), made.stream_claude(*args, **kwargs))[1]) # type: ignore[method-assign]
|
||||
code, out, err, prompts = self.parked_run(fake)
|
||||
self.assertEqual((code, len(prompts)), (1, 1))
|
||||
self.assertIn('`merge` is \'nobody\', not "chunk" or "human"', err)
|
||||
self.assertNotIn("parked: ", out)
|
||||
|
||||
def test_where_the_chunk_merges_an_approved_pull_request_parks_no_chunk(self) -> None:
|
||||
self.forges = [awaiting(decision="APPROVED")]
|
||||
fake = FakeEffects(streams=[self.worker()], claude=[judged("finished")], git=UNREAD, windows=PARKED_WINDOW)
|
||||
|
||||
Reference in New Issue
Block a user