From a96bd2ff3813352efe20f99a2972f32cba73afcf Mon Sep 17 00:00:00 2001 From: jochen Date: Sat, 24 Oct 2026 04:00:41 +0200 Subject: [PATCH 1/3] Mark the packages whose tests read files outside their directory, so mesh-build-go never keeps their verdict (issue 1935) --- cmd/mesh-controller/reads-outside | 1 + internal/inventory/reads-outside | 1 + internal/link/reads-outside | 1 + internal/ownmanifest/reads-outside | 1 + internal/store/reads-outside | 1 + 5 files changed, 5 insertions(+) create mode 100644 cmd/mesh-controller/reads-outside create mode 100644 internal/inventory/reads-outside create mode 100644 internal/link/reads-outside create mode 100644 internal/ownmanifest/reads-outside create mode 100644 internal/store/reads-outside diff --git a/cmd/mesh-controller/reads-outside b/cmd/mesh-controller/reads-outside new file mode 100644 index 00000000..976b0f50 --- /dev/null +++ b/cmd/mesh-controller/reads-outside @@ -0,0 +1 @@ +These tests read files outside this directory (the repository's root files or other directories): mesh-build-go never keeps this package's verdict (issue 1935). diff --git a/internal/inventory/reads-outside b/internal/inventory/reads-outside new file mode 100644 index 00000000..976b0f50 --- /dev/null +++ b/internal/inventory/reads-outside @@ -0,0 +1 @@ +These tests read files outside this directory (the repository's root files or other directories): mesh-build-go never keeps this package's verdict (issue 1935). diff --git a/internal/link/reads-outside b/internal/link/reads-outside new file mode 100644 index 00000000..976b0f50 --- /dev/null +++ b/internal/link/reads-outside @@ -0,0 +1 @@ +These tests read files outside this directory (the repository's root files or other directories): mesh-build-go never keeps this package's verdict (issue 1935). diff --git a/internal/ownmanifest/reads-outside b/internal/ownmanifest/reads-outside new file mode 100644 index 00000000..976b0f50 --- /dev/null +++ b/internal/ownmanifest/reads-outside @@ -0,0 +1 @@ +These tests read files outside this directory (the repository's root files or other directories): mesh-build-go never keeps this package's verdict (issue 1935). diff --git a/internal/store/reads-outside b/internal/store/reads-outside new file mode 100644 index 00000000..976b0f50 --- /dev/null +++ b/internal/store/reads-outside @@ -0,0 +1 @@ +These tests read files outside this directory (the repository's root files or other directories): mesh-build-go never keeps this package's verdict (issue 1935). From 8831c74f70cde8de849c5fc76e38c3142106db75 Mon Sep 17 00:00:00 2001 From: jochen Date: Sat, 24 Oct 2026 04:38:51 +0200 Subject: [PATCH 2/3] Mark the packages whose tests read files outside their directory, found by the review (issue 1935) --- internal/broker/reads-outside | 1 + internal/gosource/reads-outside | 1 + internal/lint/reads-outside | 1 + internal/recordmirror/reads-outside | 1 + 4 files changed, 4 insertions(+) create mode 100644 internal/broker/reads-outside create mode 100644 internal/gosource/reads-outside create mode 100644 internal/lint/reads-outside create mode 100644 internal/recordmirror/reads-outside diff --git a/internal/broker/reads-outside b/internal/broker/reads-outside new file mode 100644 index 00000000..f6b2d871 --- /dev/null +++ b/internal/broker/reads-outside @@ -0,0 +1 @@ +These tests read files outside this directory (the whole catalogue, the repository, or its root files): mesh-build-go never keeps this package's verdict (issue 1935). diff --git a/internal/gosource/reads-outside b/internal/gosource/reads-outside new file mode 100644 index 00000000..f6b2d871 --- /dev/null +++ b/internal/gosource/reads-outside @@ -0,0 +1 @@ +These tests read files outside this directory (the whole catalogue, the repository, or its root files): mesh-build-go never keeps this package's verdict (issue 1935). diff --git a/internal/lint/reads-outside b/internal/lint/reads-outside new file mode 100644 index 00000000..f6b2d871 --- /dev/null +++ b/internal/lint/reads-outside @@ -0,0 +1 @@ +These tests read files outside this directory (the whole catalogue, the repository, or its root files): mesh-build-go never keeps this package's verdict (issue 1935). diff --git a/internal/recordmirror/reads-outside b/internal/recordmirror/reads-outside new file mode 100644 index 00000000..f6b2d871 --- /dev/null +++ b/internal/recordmirror/reads-outside @@ -0,0 +1 @@ +These tests read files outside this directory (the whole catalogue, the repository, or its root files): mesh-build-go never keeps this package's verdict (issue 1935). From ecbb317dc3244a5bb2063056178093fda2128bdb Mon Sep 17 00:00:00 2001 From: jochen Date: Sat, 24 Oct 2026 14:32:47 +0200 Subject: [PATCH 3/3] Wait for tier 1's module to be marked taken from its key: the tier moves in one look and the mark comes in the next, so a loaded build node read it between them (group check fcb076c5387f) --- .../silent_mid_tier_integration_test.go | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/cmd/mesh-controller/silent_mid_tier_integration_test.go b/cmd/mesh-controller/silent_mid_tier_integration_test.go index 4d403b24..fc7c8577 100644 --- a/cmd/mesh-controller/silent_mid_tier_integration_test.go +++ b/cmd/mesh-controller/silent_mid_tier_integration_test.go @@ -193,9 +193,13 @@ func TestAPlanPassesATierWhoseMachineNeverReportsAfterTheBoundAndSendsTheNextToT if !strings.Contains(moved, "laptop") || strings.Contains(moved, "anchor") { t.Errorf("1160/AC5: the plan says %q; want laptop named silent and not anchor", moved) } - if b := plan().Modules["b"]; b == nil || !b.Key { - t.Errorf("tier 1's module is not taken from its key: %+v", b) - } + // The move to tier 1 is saved in one step and the look that marks b taken from its key is the next (release_plan.go + // advances the tier, plan_keys.go takeFromKey marks it): read b once that look ran, not in the instant the tier moved, + // which a loaded build node shows before it (group check fcb076c5387f). + eventually(t, "tier 1's module taken from its key", func() bool { + b := plan().Modules["b"] + return b != nil && b.Key + }) // Tier 1's module is taken from its key once that is built, which the walk's look does by itself. heldB.Store(false) askToLook()