From 212c8e4f5296409ac96b3cc92e532d673b88f2bc Mon Sep 17 00:00:00 2001 From: jochen Date: Thu, 22 Oct 2026 22:26:30 +0200 Subject: [PATCH] Drop the now-dead novox/hq strip in mounts's, nfs-server's, sensors's and zfs's manifest checks (issue 1838) --- modules/mounts/cmd/mounts/manifest_test.go | 3 +-- modules/nfs-server/cmd/nfs-server/manifest_test.go | 2 +- modules/sensors/cmd/sensors/manifest_test.go | 3 +-- modules/zfs/cmd/zfs-tools/manifest_test.go | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/modules/mounts/cmd/mounts/manifest_test.go b/modules/mounts/cmd/mounts/manifest_test.go index 674516fc..7137a24c 100644 --- a/modules/mounts/cmd/mounts/manifest_test.go +++ b/modules/mounts/cmd/mounts/manifest_test.go @@ -109,9 +109,8 @@ func TestTheManifestNamesWhatTheBundleServesAndWhatItNeeds(t *testing.T) { t.Errorf("config value %s: %v", key, s) } } - // A machine's or a person's name, as a word: "novox/hq" names the record, not the machine. // 1838/AC1: the catalogue-wide check covers a node's name now; this list keeps what it does not. - if hit := regexp.MustCompile(`\b(jochen|recalbox)\b|/home/|/storage`).FindString(strings.ReplaceAll(raw, "novox/hq", "")); hit != "" { + if hit := regexp.MustCompile(`\b(jochen|recalbox)\b|/home/|/storage`).FindString(raw); hit != "" { t.Errorf("the manifest says %q", hit) } if strings.Contains(raw, "/etc/fstab") { diff --git a/modules/nfs-server/cmd/nfs-server/manifest_test.go b/modules/nfs-server/cmd/nfs-server/manifest_test.go index cc37bbf4..42f01021 100644 --- a/modules/nfs-server/cmd/nfs-server/manifest_test.go +++ b/modules/nfs-server/cmd/nfs-server/manifest_test.go @@ -99,7 +99,7 @@ func TestItListensOnTwoThousandFortyNineFromTheMeshOnlyAndProvidesTheShare(t *te func TestTheDefinitionNamesNoFolderNoMachineAndGivesTheSharesNoDefault(t *testing.T) { m, raw := readManifest(t) // 1838/AC1: the catalogue-wide check covers a node's name now; this list keeps what it does not. - if hit := regexp.MustCompile(`\bjochen\b|/home/|/storage|/srv/`).FindString(strings.ReplaceAll(raw, "novox/hq", "")); hit != "" { + if hit := regexp.MustCompile(`\bjochen\b|/home/|/storage|/srv/`).FindString(raw); hit != "" { t.Errorf("the manifest says %q", hit) } if s := m.Config["shares"]; s["required"] != true || s["default"] != nil || s["type"] != "string" { diff --git a/modules/sensors/cmd/sensors/manifest_test.go b/modules/sensors/cmd/sensors/manifest_test.go index 2ced624b..8db732b6 100644 --- a/modules/sensors/cmd/sensors/manifest_test.go +++ b/modules/sensors/cmd/sensors/manifest_test.go @@ -45,9 +45,8 @@ func TestTheManifestNamesExactlyTheToolsTheBundleServesAllReadOnlyAndNoMachine(t if len(m.Claims) != 0 { t.Errorf("the module holds no seat (ADR 0256 rule 3), and claims %v", m.Claims) } - // A machine's or a person's name, as a word: "novox/hq" names the record, not the machine. // 1838/AC1: the catalogue-wide check covers a node's name now; this list keeps what it does not. - if hit := regexp.MustCompile(`\bjochen\b|/home/`).FindString(strings.ReplaceAll(raw, "novox/hq", "")); hit != "" { + if hit := regexp.MustCompile(`\bjochen\b|/home/`).FindString(raw); hit != "" { t.Errorf("the manifest says %q", hit) } } diff --git a/modules/zfs/cmd/zfs-tools/manifest_test.go b/modules/zfs/cmd/zfs-tools/manifest_test.go index 932d137c..2346d03e 100644 --- a/modules/zfs/cmd/zfs-tools/manifest_test.go +++ b/modules/zfs/cmd/zfs-tools/manifest_test.go @@ -72,7 +72,7 @@ func TestTheManifestNamesTheToolsTheBundleServesAndWhatEachReplaces(t *testing.T t.Errorf("emits %v", m.Emits) } // 1838/AC1: the catalogue-wide check covers a node's name now; this list keeps what it does not. - if hit := regexp.MustCompile(`\bjochen\b|/home/`).FindString(strings.ReplaceAll(raw, "novox/hq", "")); hit != "" { + if hit := regexp.MustCompile(`\bjochen\b|/home/`).FindString(raw); hit != "" { t.Errorf("the manifest says %q", hit) } }