From f018a16540a4904b37fa19979c79c63f41892953 Mon Sep 17 00:00:00 2001 From: Nick Khyl Date: Fri, 24 Oct 2025 09:48:05 -0500 Subject: [PATCH] health: fix TestControlHealthNotifies on release branches Currently, TestControlHealthNotifies expects three initial health-change events, including is-using-unstable-version, regardless of whether tests run on an unstable or release branch. This change makes the is-using-unstable-version check conditional. Fixes #17635 Signed-off-by: Nick Khyl --- health/health_test.go | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/health/health_test.go b/health/health_test.go index 607071776..5c9868885 100644 --- a/health/health_test.go +++ b/health/health_test.go @@ -741,11 +741,18 @@ func TestControlHealthNotifies(t *testing.T) { // Expect events at starup, before doing anything else synctest.Wait() - if err := eventbustest.ExpectExactly(tw, + initialEvents := []any{ eventbustest.Type[Change](), // warming-up - eventbustest.Type[Change](), // is-using-unstable-version + } + if version.IsUnstableBuild() { + initialEvents = append(initialEvents, + eventbustest.Type[Change](), // is-using-unstable-version + ) + } + initialEvents = append(initialEvents, eventbustest.Type[Change](), // not-in-map-poll - ); err != nil { + ) + if err := eventbustest.ExpectExactly(tw, initialEvents...); err != nil { t.Errorf("startup error: %v", err) }