From d281faeeb76a99a1aea0841f64466fee645cfb55 Mon Sep 17 00:00:00 2001 From: jochen Date: Fri, 20 Nov 2026 17:08:23 +0100 Subject: [PATCH] mesh-delivery-assigner: the validate test judges a revision whose base is below its number minus one Every revision the validate test judged with a base had it at its number minus one, so the test passed with the case before read as the number before (review round 1). Revision 12 now names base 7 with 8 to 11 never kept: it ends manifest-refused against base 7's manifests, and could not run when the case before is read as the number minus one. No test added. Builds: design 47 H-A-154 (hq design/47-H1-answers-59 01842bbe), H-A-151 --- .../validatestep_test.go | 23 +++++++++++++++---- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/validatestep_test.go b/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/validatestep_test.go index 6ca9cb01..7d3575d9 100644 --- a/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/validatestep_test.go +++ b/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/validatestep_test.go @@ -30,13 +30,18 @@ func TestTheValidateStepRefusesAManifestProblemAndACycle(t *testing.T) { return meshcatalog.CatalogEntry{Module: module, Manifest: map[string]any{"module": module, "d": digest}, ManifestDigest: digest, Edges: edges} } revisions := map[int64][]meshcatalog.CatalogEntry{ - 6: {indexer, entry("web", "d-web-1"), entry("db", "d-db")}, - 7: {indexer, entry("web", "d-web-2"), entry("db", "d-db")}, - 9: {indexer, entry("a", "d-a", meshcatalog.Edge{From: "a:x", To: "b:y", Kind: 3}, meshcatalog.Edge{From: "b:y", To: "a:x", Kind: 3}), entry("b", "d-b")}, - 3: {indexer}, + 6: {indexer, entry("web", "d-web-1"), entry("db", "d-db")}, + 7: {indexer, entry("web", "d-web-2"), entry("db", "d-db")}, + 9: {indexer, entry("a", "d-a", meshcatalog.Edge{From: "a:x", To: "b:y", Kind: 3}, meshcatalog.Edge{From: "b:y", To: "a:x", Kind: 3}), entry("b", "d-b")}, + 3: {indexer}, + 12: {indexer, entry("web", "d-web-2"), entry("db", "d-db")}, } - // base is the newest kept revision below n, as the take-in names it; none below the first. + // base is the newest kept revision below n, as the take-in names it; none below the first. Revision 12 names 7 with 8 to 11 + // never kept, so a case before read as the number minus one could not run (H-A-154). base := func(n int64) (b int64) { + if n == 12 { + return 7 + } for k := range revisions { if k < n && k > b { b = k @@ -134,4 +139,12 @@ func TestTheValidateStepRefusesAManifestProblemAndACycle(t *testing.T) { o.Said != reasonManifestRefused+`: web: unknown field "colour" (`+emptyBeforeWords+")" || len(asks) != 2 || len(requests[1].Cases[1].Manifests) != 0 { t.Errorf("a revision naming no base ended %+v (%d validator asks), want it judged against an empty case before, said", o, len(asks)) } + // Revision 12 holds revision 7's manifests and names base 7: judged against it, web's problem is the revision's, db's old one + // is not, and the case before holds base 7's manifests. + if o := r.validate(ctx, "ask-base", step("web", 12)); o.Outcome != meshwants.StepEndedOutcomeFailed || + o.Said != reasonManifestRefused+`: web: unknown field "colour"` || len(asks) != 3 { + t.Errorf("a revision naming base 7 below its number ended %+v (%d validator asks), want it judged against base 7", o, len(asks)) + } else if web := requests[2].Cases[1].Manifests["web"]; len(requests[2].Cases[1].Manifests) != 3 || !strings.Contains(string(web.Raw), "d-web-2") { + t.Errorf("the case before of revision 12 is %+v, want base 7's manifests", requests[2].Cases[1].Manifests) + } }