issue 1025: the nested-module check is a file of its own, and the gate test keeps the app module in its repository

cmd/mesh-controller/merge_check_nested_test.go

@@ -9,10 +9,10 @@ import (
 )
 
 // **A repository's merge check runs every module's unit tests, a Go module of its own below the root included**
-// (novox/hq ADR 0420 §5, issue 1025): `./...` stops at a nested go.mod. This runs the script's own
-// `nested-modules` mode in a tree with a `go` that only records where it was run and fails for a module named bad.
+// (novox/hq ADR 0420 §5, issue 1025): `./...` stops at a nested go.mod. This runs the script
+// check-nested-modules.sh in a tree with a `go` that only records where it was run and fails for a module named bad.
 func TestTheMergeCheckVetsAndTestsEveryNestedGoModule(t *testing.T) {
-	script, err := filepath.Abs("../../merge-check.sh")
+	script, err := filepath.Abs("../../check-nested-modules.sh")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -24,7 +24,7 @@ func TestTheMergeCheckVetsAndTestsEveryNestedGoModule(t *testing.T) {
 		t.Fatal(err)
 	}
 	run := func() (string, error) {
-		cmd := exec.Command("sh", script, "nested-modules")
+		cmd := exec.Command("sh", script)
 		cmd.Dir = tree
 		cmd.Env = append(os.Environ(), "PATH="+bin+":"+os.Getenv("PATH"), "LOG="+log, "GOFLAGS=-mod=vendor")
 		out, err := cmd.CombinedOutput()

cmd/mesh-controller/merge_gate_test.go

@@ -527,6 +527,10 @@ func TestADeliveryGroupMovingAModuleMachinesRunPassesTheGate(t *testing.T) {
 	f, manifests := catalogueMeshWithAnApp(t)
 	catTree := aTree(t, withEdit(manifests, "album", ""))
 	app := t.TempDir()
+	// The app module is built from this repository's root, and stays there: only album moves.
+	if err := os.WriteFile(filepath.Join(app, "module.json"), []byte(`{"module":"app","version":"1"}`), 0o644); err != nil {
+		t.Fatal(err)
+	}
 	if err := os.MkdirAll(filepath.Join(app, "modules", "album"), 0o755); err != nil {
 		t.Fatal(err)
 	}