Pin do-epic's tests to the order that asks origin before the fetch
CI / tests (pull_request) Successful in 3m36s

This commit is contained in:
2026-11-20 23:39:46 +01:00
parent 49d37891fe
commit b6a27cc4dd
+2 -2
View File
@@ -1051,12 +1051,12 @@ class AnEpicsWorkingBranch(DoEpicTest):
out = io.StringIO()
with contextlib.redirect_stdout(out):
self.assertEqual(main.epic_based("ABC-20", self.checkout, self.epic_run(fake)), "ABC-12")
self.assertEqual(self.git_calls, [(args, self.checkout) for args in (("symbolic-ref", "--short", "refs/remotes/origin/HEAD"), ("fetch", "--quiet", "origin"), ("ls-remote", "--heads", "origin", "refs/heads/ABC-12"), ("rev-list", "--count", "origin/ABC-12..origin/main"), ("config", "branch.ABC-20.chunk-base", "ABC-12"))])
self.assertEqual(self.git_calls, [(args, self.checkout) for args in (("symbolic-ref", "--short", "refs/remotes/origin/HEAD"), ("ls-remote", "--heads", "origin", "refs/heads/ABC-12"), ("fetch", "--quiet", "origin"), ("rev-list", "--count", "origin/ABC-12..origin/main"), ("config", "branch.ABC-20.chunk-base", "ABC-12"))])
self.assertIn("origin/ABC-12 already holds origin/main; ABC-20's pull request goes into ABC-12\n", out.getvalue())
def test_a_call_to_origin_that_levels_the_branch_is_stopped_after_a_minute_so_no_window_hangs_before_its_first_cycle(self) -> None:
main.epic_based("ABC-20", self.checkout, self.epic_run(self.with_git(FakeEffects(), ls_remote="", push="")))
self.assertEqual([timed for timed in self.git_timeouts if timed[0] in ("fetch", "ls-remote", "push")], [("fetch", 60), ("ls-remote", 60), ("push", 60), ("fetch", 60)])
self.assertEqual([timed for timed in self.git_timeouts if timed[0] in ("fetch", "ls-remote", "push")], [("ls-remote", 60), ("fetch", 60), ("push", 60), ("fetch", 60)])
def test_says_the_default_branchs_whole_name_however_it_ends(self) -> None:
out = io.StringIO()