From dc6728729e903e83d7bc91de51dc38e115d79624 Mon Sep 17 00:00:00 2001
From: Brad Fitzpatrick <bradfitz@tailscale.com>
Date: Thu, 5 Dec 2024 15:45:48 -0800
Subject: [PATCH] health: fix TestHealthMetric to pass on release branch

Fixes #14302

Change-Id: I9fd893a97711c72b713fe5535f2ccb93fadf7452
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
---
 health/health_test.go | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/health/health_test.go b/health/health_test.go
index 69e586066..ebdddc988 100644
--- a/health/health_test.go
+++ b/health/health_test.go
@@ -14,6 +14,7 @@ import (
 	"tailscale.com/tailcfg"
 	"tailscale.com/types/opt"
 	"tailscale.com/util/usermetric"
+	"tailscale.com/version"
 )
 
 func TestAppendWarnableDebugFlags(t *testing.T) {
@@ -352,6 +353,11 @@ func TestShowUpdateWarnable(t *testing.T) {
 }
 
 func TestHealthMetric(t *testing.T) {
+	unstableBuildWarning := 0
+	if version.IsUnstableBuild() {
+		unstableBuildWarning = 1
+	}
+
 	tests := []struct {
 		desc            string
 		check           bool
@@ -361,20 +367,20 @@ func TestHealthMetric(t *testing.T) {
 	}{
 		// When running in dev, and not initialising the client, there will be two warnings
 		// by default:
-		// - is-using-unstable-version
+		// - is-using-unstable-version (except on the release branch)
 		// - wantrunning-false
 		{
 			desc:            "base-warnings",
 			check:           true,
 			cv:              nil,
-			wantMetricCount: 2,
+			wantMetricCount: unstableBuildWarning + 1,
 		},
 		// with: update-available
 		{
 			desc:            "update-warning",
 			check:           true,
 			cv:              &tailcfg.ClientVersion{RunningLatest: false, LatestVersion: "1.2.3"},
-			wantMetricCount: 3,
+			wantMetricCount: unstableBuildWarning + 2,
 		},
 	}
 	for _, tt := range tests {