From 35829d5a9a8e959a485a43684181facf897be9a2 Mon Sep 17 00:00:00 2001 From: jochen Date: Wed, 21 Oct 2026 13:18:38 +0200 Subject: [PATCH] Keep the test's first batch assembling (issue 1617) --- cmd/mesh-controller/new_module_on_merge_test.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cmd/mesh-controller/new_module_on_merge_test.go b/cmd/mesh-controller/new_module_on_merge_test.go index c41c958f..a5b38109 100644 --- a/cmd/mesh-controller/new_module_on_merge_test.go +++ b/cmd/mesh-controller/new_module_on_merge_test.go @@ -106,16 +106,17 @@ func TestAMergeBuildsItsNewModuleBesideItsPlan(t *testing.T) { // module is registered while the batch waits; cutting the batch asks it no second time (1617/AC2). func TestAMergeAddingAModuleAsksItsBuildBeforeItsBatchIsCut(t *testing.T) { open := windowed(t) + groupsWaiting(t, "pr/c1") asked := asksWithPaths(t) catalog := func(commit string, made time.Time, paths ...string) link.SourceMoved { return link.SourceMoved{Owner: "novox", Repo: "mesh-catalog", Base: "main", Commit: commit, - MergedAt: made.Format(time.RFC3339Nano), Paths: paths} + Head: "pr/" + commit, MergedAt: made.Format(time.RFC3339Nano), Paths: paths} } hear(t, open, catalog("c1", t0, "modules/app/index.ts"), t0) if len(*asked) != 0 { t.Fatalf("a merge adding no module asked %v", *asked) } - hear(t, open, catalog("c2", t0.Add(10*time.Second), "modules/go/packages.json", "modules/go/module.json"), t0.Add(10*time.Second)) + hear(t, open, lone(catalog("c2", t0.Add(10*time.Second), "modules/go/packages.json", "modules/go/module.json")), t0.Add(10*time.Second)) if ws, bs := walks(t, open); len(ws) != 0 || len(bs) != 1 { t.Fatalf("the batch should still be assembling: %d walk(s), %d batch(es)", len(ws), len(bs)) }