Fix the six tests the merge gate refused: assignments beside pulled-in modules, migration tests on the tables, the event compared as JSON, the restarted move settled to the table (issues 1090, 1092, 1093, 1095)

cmd/mesh-controller/chain_integration_test.go

@@ -108,10 +108,14 @@ func TestOneReadOfAnAssignmentNamesItsCommitBuildAndRolloutAndOneReadOfTheRollou
 
 	// One read of the assignment.
 	on, err := inv.AssignmentsOn(ctx, "anchor")
-	if err != nil || len(on) != 1 {
+	a, ok := assignmentOf(on, "notes")
+	if err != nil || !ok {
 		t.Fatalf("the assignments of anchor: %+v %v", on, err)
 	}
-	a := on[0]
+	// Beside it a module pulled in by the assignment, which no send of this walk put anywhere.
+	if wireguard, pulled := assignmentOf(on, "mesh-wireguard"); pulled && (wireguard.Build != "" || wireguard.Rollout != "") {
+		t.Fatalf("a module this rollout did not send names a build or a rollout: %+v", wireguard)
+	}
 	if a.Module != "notes" || a.Commit != "c-notes" || a.Build != buildID || a.Rollout != rollout || a.Artifact != digest ||
 		a.Since.IsZero() || a.Assigned.IsZero() || !a.Stands() {
 		t.Fatalf("the assignment names %+v, not commit c-notes, build %s, artifact %s, rollout %s", a, buildID, digest, rollout)
@@ -169,21 +173,37 @@ func TestASendOfWhatAMachineRunsAlreadyChangesNoLinkOfItsAssignment(t *testing.T
 		t.Fatal(err)
 	}
 	on, _ := inv.AssignmentsOn(ctx, "anchor")
-	if len(on) != 1 || on[0].Rollout != "plan-1" || on[0].Build != "build-1" || on[0].Commit != "c1" {
+	if a, _ := assignmentOf(on, "notes"); a.Rollout != "plan-1" || a.Build != "build-1" || a.Commit != "c1" {
 		t.Fatalf("the assignment names %+v", on)
 	}
 	// A declaration sent by hand with no builds known says nothing of them.
 	if err := inv.RecordSent(ctx, node, "d3", nil); err != nil {
 		t.Fatal(err)
 	}
-	if on, _ = inv.AssignmentsOn(ctx, "anchor"); len(on) != 1 || on[0].Commit != "c1" {
+	if on, _ = inv.AssignmentsOn(ctx, "anchor"); runOf(on, "notes").Commit != "c1" {
 		t.Fatalf("a send of unknown builds changed %+v", on)
 	}
 	// A module sent a commit no build is kept of is named by its commit alone.
 	if err := inv.RecordSent(ctx, node, "d4", map[string]string{"notes": "c2"}); err != nil {
 		t.Fatal(err)
 	}
-	if on, _ = inv.AssignmentsOn(ctx, "anchor"); len(on) != 1 || on[0].Commit != "c2" || on[0].Build != "" || on[0].Rollout != "" {
+	if on, _ = inv.AssignmentsOn(ctx, "anchor"); runOf(on, "notes").Commit != "c2" || runOf(on, "notes").Build != "" ||
+		runOf(on, "notes").Rollout != "" {
 		t.Fatalf("the assignment after a push of c2 by hand names %+v", on)
 	}
 }
+
+// assignmentOf is one module's assignment among those of a machine: assigning a module assigns what it requires beside it.
+func assignmentOf(on []chain.Assignment, module string) (chain.Assignment, bool) {
+	for _, a := range on {
+		if a.Module == module {
+			return a, true
+		}
+	}
+	return chain.Assignment{}, false
+}
+
+func runOf(on []chain.Assignment, module string) chain.Assignment {
+	a, _ := assignmentOf(on, module)
+	return a
+}