From 36259f3406f7f6fbda4087a9d0419908e4a3d4ab Mon Sep 17 00:00:00 2001 From: mesh-tools Date: Wed, 21 Oct 2026 09:53:48 +0000 Subject: [PATCH] Update the build modules' manifest tests for the toolchain provisions (issue 1573) --- modules/mesh-build-go/cmd/mesh-build-go/forge_test.go | 4 ++-- modules/mesh-build-go/cmd/mesh-build-go/manifest_test.go | 2 +- modules/mesh-build-node/cmd/mesh-build-node/manifest_test.go | 5 ++++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/modules/mesh-build-go/cmd/mesh-build-go/forge_test.go b/modules/mesh-build-go/cmd/mesh-build-go/forge_test.go index 27a0cc76..ac9e1666 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/forge_test.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/forge_test.go @@ -143,8 +143,8 @@ func TestForgeFilesRenderFromTheBoundValuesInTheModulesOwnHome(t *testing.T) { // template in the files/ archive (novox/hq ADR 0349 ยง2). func TestManifestRequiresForgeAccountKeepsKeysAndTakesFilesFromTemplates(t *testing.T) { m := readForgeManifest(t) - if len(m.Requires) != 1 || m.Requires[0] != "forge-account" { - t.Errorf("requires = %v, want [forge-account]", m.Requires) + if len(m.Requires) != 2 || m.Requires[0] != "forge-account" || m.Requires[1] != "go-toolchain" { + t.Errorf("requires = %v, want [forge-account go-toolchain]", m.Requires) } keeps := false for _, s := range m.State { diff --git a/modules/mesh-build-go/cmd/mesh-build-go/manifest_test.go b/modules/mesh-build-go/cmd/mesh-build-go/manifest_test.go index e1436f55..99355848 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/manifest_test.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/manifest_test.go @@ -64,7 +64,7 @@ func TestManifestIsValidAndDeclaresTheAccountTheCapabilityAndThePackages(t *test } } slices.Sort(packages) - if want := []string{"git", "go", "openssh", "postgresql"}; !slices.Equal(packages, want) { + if want := []string{"git", "openssh", "postgresql"}; !slices.Equal(packages, want) { t.Errorf("packages = %v, want %v", packages, want) } } diff --git a/modules/mesh-build-node/cmd/mesh-build-node/manifest_test.go b/modules/mesh-build-node/cmd/mesh-build-node/manifest_test.go index 8fb06a2d..efc359e9 100644 --- a/modules/mesh-build-node/cmd/mesh-build-node/manifest_test.go +++ b/modules/mesh-build-node/cmd/mesh-build-node/manifest_test.go @@ -66,7 +66,7 @@ func TestManifestIsValidAndDeclaresTheAccountTheCapabilityAndThePackages(t *test } } slices.Sort(packages) - if want := []string{"git", "nodejs", "npm", "openssh"}; !slices.Equal(packages, want) { + if want := []string{"git", "openssh"}; !slices.Equal(packages, want) { t.Errorf("packages = %v, want %v", packages, want) } } @@ -134,6 +134,9 @@ func TestTheModuleCarriesItsToolchainLockAndTheManifestPlacesIt(t *testing.T) { t.Errorf("the module carries no toolchain/%s: %v", name, err) } } + if !slices.Contains(m.Requires, "node-toolchain") { + t.Errorf("requires = %v lack node-toolchain, which provides the nodejs and npm packages (issue 1573)", m.Requires) + } if !slices.Contains(m.Requires, "npm-package-registry") { t.Errorf("requires = %v lack npm-package-registry, which the install resolves @novox from", m.Requires) }