mesh-delivery-gate: read the queue's state word as the controller says it, in flight (issue 1274)
mesh/check failed: unit: modules/gitea.test: [gitea] where the poll of merges last looked from could not be read, so none is kept — no runtime | fbbf2…
mesh/merge-gate head fbbf28d21c37 merged into trunk c3d3194bc8d4 — pass: builds mesh-delivery-gate → novox; no bus step; every machine composes with the ch…
mesh/repo-check head fbbf28d21c37 merged into trunk c3d3194bc8d4 — pass: its merge-check.sh passed, each part in its toolchain: merge-check.sh (go), merge-…
mesh/delivery delivered

This commit is contained in:
2026-10-22 16:36:23 +02:00
parent fb89990e2b
commit fbbf28d21c
3 changed files with 6 additions and 4 deletions
@@ -69,7 +69,7 @@ func TestACheckTheQueueStillHoldsIsNotAskedAgain(t *testing.T) {
id := IDOf("novox/app", head)
w.h.PullUpdated(pr("novox/app", 7, head, "feat/x", "src/a.go"))
w.settleAll()
w.ctl.queue[0].State = "in-flight"
w.ctl.queue[0].State = "in flight"
w.later(3 * time.Hour)
w.settleAll()
if len(w.ctl.checks) != 1 {
@@ -61,10 +61,12 @@ func heldBy(d *Delivery, asks []QueuedAsk) *QueuedAsk {
}
func (a QueuedAsk) words() string {
if a.State == "in-flight" && a.Machine != "" {
// The controller's `queue` says the state "in flight", its table's word.
state := strings.ReplaceAll(a.State, "-", " ")
if state == "in flight" && a.Machine != "" {
return a.ID + " is in flight on " + a.Machine
}
return a.ID + " is " + strings.ReplaceAll(a.State, "-", " ") + " in the build queue"
return a.ID + " is " + state + " in the build queue"
}
// lostChecks are the asks again of proposed deliveries whose asked check the build queue holds no entry of, past the
@@ -75,7 +75,7 @@ type Controller interface {
// QueuedAsk is one ask of the build queue as the controller's `queue` answers it as data.
type QueuedAsk struct {
ID string `json:"id"`
State string `json:"state"` // waiting, in-flight or dead
State string `json:"state"` // waiting, in flight or dead
Kind string `json:"kind"` // check or delivery
Repository string `json:"repository"`
Commit string `json:"commit,omitempty"`