From b56670535f82bffed55ffd1b22e15f6d25f57214 Mon Sep 17 00:00:00 2001 From: mesh-tools Date: Tue, 20 Oct 2026 21:56:31 +0000 Subject: [PATCH] Name the build test's fixture manifest module.json.fixture, so no reader takes it for a module of the catalogue (issue 1527) --- .../cmd/mesh-build-go/test_real_integration_test.go | 5 +++++ .../repos/build/{module.json => module.json.fixture} | 0 2 files changed, 5 insertions(+) rename modules/mesh-build-go/cmd/mesh-build-go/testdata/repos/build/{module.json => module.json.fixture} (100%) diff --git a/modules/mesh-build-go/cmd/mesh-build-go/test_real_integration_test.go b/modules/mesh-build-go/cmd/mesh-build-go/test_real_integration_test.go index f6bdf6a4..60c2aac7 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/test_real_integration_test.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/test_real_integration_test.go @@ -143,6 +143,11 @@ func TestBuildTwiceGivesOneDigestAndOneExecutable(t *testing.T) { if out, err := exec.Command("cp", "-r", filepath.Join("testdata", "repos", "build")+"/.", tree).CombinedOutput(); err != nil { t.Fatalf("%v %s", err, out) } + // The fixture's manifest is kept as module.json.fixture: a module.json below a module's own directory is taken + // for a module of the catalogue by the readers of a merge (issue 1527), so it is named module.json only here. + if err := os.Rename(filepath.Join(tree, "module.json.fixture"), filepath.Join(tree, "module.json")); err != nil { + t.Fatal(err) + } home := t.TempDir() m := &Module{Home: home, Work: work, Cache: t.TempDir()} m.Run = StepRunner(home) diff --git a/modules/mesh-build-go/cmd/mesh-build-go/testdata/repos/build/module.json b/modules/mesh-build-go/cmd/mesh-build-go/testdata/repos/build/module.json.fixture similarity index 100% rename from modules/mesh-build-go/cmd/mesh-build-go/testdata/repos/build/module.json rename to modules/mesh-build-go/cmd/mesh-build-go/testdata/repos/build/module.json.fixture