health: fix TestControlHealthNotifies on release branchesnickkhyl/healthnotify-on-release

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 <nickk@tailscale.com>

1 files 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)
 				}