Test the teller's warrant by the router's real ids, a gap that adds a module, and short pages (ADR 0457, issue 1336, review round 1)

cmd/mesh-controller/catch_up_integration_test.go

@@ -61,7 +61,7 @@ func aTrunkOf(t *testing.T, repo string, modules ...string) *aTrunk {
 		_, m.Number, _ = pullOfSubject(tm.Subject)
 		return m, nil
 	}
-	findMergeWarrant = func(_ context.Context, _ catalogueReader, number int, head string) (string, bool, string, error) {
+	findMergeWarrant = func(_ context.Context, _ catalogueReader, _, _ string, number int, head string) (string, bool, string, error) {
 		for _, m := range tr.merges {
 			if strings.Contains(m.Subject, fmt.Sprintf("(#%d)", number)) && m.Head == head && tr.approved[m.Commit] {
 				return "the operator chose Approve (ask merge-" + fmt.Sprint(number) + ")", true, "", nil
@@ -175,17 +175,14 @@ func TestAMergeOlderThanTheLastFiftyIsNotRead(t *testing.T) {
 		c := fmt.Sprintf("mesh-catalog-c%02d", i)
 		hear(t, open, catalogueMerge(c, "app", t0.Add(time.Duration(i)*time.Minute)), t0.Add(time.Duration(i)*time.Minute+time.Second))
 	}
-	// Paged as the forge pages: fifty a page.
+	// Paged as the forge pages: fifty a page, and a trunk of another repository is empty (a short page, or none).
 	pages := trunkCommitsPage
 	trunkCommitsPage = func(ctx context.Context, owner, name, branch string, page int) ([]trunkCommit, error) {
 		all, err := pages(ctx, owner, name, branch, 1)
-		if err != nil || page > 2 {
+		if err != nil || page < 1 || (page-1)*50 >= len(all) {
 			return nil, err
 		}
-		if page == 1 {
-			return all[:50], nil
-		}
-		return all[50:], nil
+		return all[(page-1)*50 : min(page*50, len(all))], nil
 	}
 	t.Cleanup(func() { trunkCommitsPage = pages })
 	(following{open: open}).catchUp(t.Context(), nil)
@@ -258,3 +255,37 @@ func TestAForgeThatDoesNotAnswerLeavesTheCatchUpForTheNextStart(t *testing.T) {
 		t.Fatalf("the next start did not catch up (left for later: %v)", later)
 	}
 }
+
+// Finding 2 of the review: a gap that adds a module is a gap, judged as hearMerge judges it. With the operator's Approve on record it
+// is heard (hearMerge asks the new module in its walk); without, it raises the condition and is not lost in silence.
+func TestAGapThatAddsAModuleIsHeardOnItsWarrantAndRaisedWithout(t *testing.T) {
+	open := windowed(t)
+	everyHeadWaits(t)
+	asksRecorded(t)
+	keeper, _ := withConditionsInMemory(t)
+	tr := aTrunkOf(t, "mesh-catalog", "newmodule")
+	tr.approved["mesh-catalog-c01"] = false
+	catch := func() { (following{open: open}).catchUp(t.Context(), nil) }
+	catch()
+	if mergeKnown(t, open, "mesh-catalog-c01") {
+		t.Fatal("a merge adding a module was heard with no Approve on record")
+	}
+	all, err := keeper.Open(t.Context())
+	if err != nil {
+		t.Fatal(err)
+	}
+	var raised int
+	for _, c := range all {
+		if c.Kind == kindMergeNotHeard {
+			raised++
+		}
+	}
+	if raised != 1 {
+		t.Fatalf("a merge adding a module with no Approve raised %d condition(s), not one: it was lost in silence", raised)
+	}
+	tr.approved["mesh-catalog-c01"] = true
+	catch()
+	if !mergeKnown(t, open, "mesh-catalog-c01") {
+		t.Fatal("a merge adding a module was not heard once its Approve was on record")
+	}
+}