gate: deliveries and show say an approved merge waits for the check of the named delivery on the named repository, and the turns bucket is read by the checker alone, written by the gate alone (ADR 0548 §3, §9; issue 568 G6)

2026-10-26 11:44:29 +01:00
parent 55a26b22cf
commit 351c7c4bf4
2 changed files with 10 additions and 0 deletions
@@ -86,6 +86,12 @@ func TestOneCheckPerDeliveryAtTheGate(t *testing.T) {
 				d.Ready.HeldSince == nil {
 				t.Fatalf("the merge does not say what it waits for: %+v", d.Ready)
 			}
+			// §9: deliveries says what it waits for.
+			for _, l := range w.h.Deliveries("", "", "", false) {
+				if l.ID == id && !strings.Contains(l.Waits, "approved; waits for the check of g") {
+					t.Errorf("deliveries says it waits for %q", l.Waits)
+				}
+			}
 			// §4: past 30 minutes the held merge is a stalled line naming the check it waits for and since when.
 			for _, l := range w.h.Stalled() {
 				if l.ID == id {
@@ -26,6 +26,10 @@ type Line struct {

 // waitsFor is what a delivery waits for, in words.
 func (h *Holder) waitsFor(d *Delivery) string {
+	if r := d.Ready; r != nil && r.Merged == nil && strings.HasPrefix(r.Waits, "approved;") {
+		// Approved and waiting for another delivery's check, or for its own verdict's carry (ADR 0548 §2, §8, §9).
+		return r.Waits
+	}
 	switch d.State {
 	case Proposed:
 		return "its check"