From 2887691414e97e6bf08fb1be75e950c29ee7b749 Mon Sep 17 00:00:00 2001 From: jochen Date: Sat, 10 Oct 2026 13:41:42 +0200 Subject: [PATCH] Walk the earlier merges of a failed walk as news (hq ADR 0276 review) --- cmd/mesh-controller/batches_test.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cmd/mesh-controller/batches_test.go b/cmd/mesh-controller/batches_test.go index 26bf3f63..b3b63de2 100644 --- a/cmd/mesh-controller/batches_test.go +++ b/cmd/mesh-controller/batches_test.go @@ -381,9 +381,10 @@ func TestAFailedWalkWalksItsEarlierMergesAlone(t *testing.T) { open := windowed(t) asked := asksWithPaths(t) ctx := t.Context() - oldest := catalogueMerge("aaaa0001", "app", t0) - middle := catalogueMerge("bbbb0002", "app", t0.Add(10*time.Second)) - newest := catalogueMerge("cccc0003", "notes", t0.Add(20*time.Second)) + // Made before the cut marks their modules seen, as merges are: walked again, they are news all the same. + oldest := catalogueMerge("aaaa0001", "app", t0.Add(-3*time.Minute)) + middle := catalogueMerge("bbbb0002", "app", t0.Add(-3*time.Minute+10*time.Second)) + newest := catalogueMerge("cccc0003", "notes", t0.Add(-3*time.Minute+20*time.Second)) for i, m := range []link.SourceMoved{oldest, middle, newest} { hear(t, open, m, t0.Add(time.Duration(i)*10*time.Second+time.Second)) }