From 5579b6f40cd15c9002f670a918fd4783a32e2945 Mon Sep 17 00:00:00 2001 From: Jan Eitzinger Date: Fri, 6 Feb 2026 16:11:10 +0100 Subject: [PATCH] Adopt unit test to new API --- pkg/metricstore/healthcheck.go | 4 +--- pkg/metricstore/metricstore_test.go | 19 ++----------------- 2 files changed, 3 insertions(+), 20 deletions(-) diff --git a/pkg/metricstore/healthcheck.go b/pkg/metricstore/healthcheck.go index 5ed10fb5..b4be57c4 100644 --- a/pkg/metricstore/healthcheck.go +++ b/pkg/metricstore/healthcheck.go @@ -95,9 +95,7 @@ func (l *Level) getHealthyMetrics(m *MemoryStore, expectedMetrics []string) []st continue } - if degraded[metricName] { - degradedList = append(degradedList, metricName) - } + degradedList = append(degradedList, metricName) } return degradedList diff --git a/pkg/metricstore/metricstore_test.go b/pkg/metricstore/metricstore_test.go index f96f49a2..ba9d7ecf 100644 --- a/pkg/metricstore/metricstore_test.go +++ b/pkg/metricstore/metricstore_test.go @@ -303,7 +303,6 @@ func TestGetHealthyMetrics(t *testing.T) { name string selector []string expectedMetrics []string - wantMissing []string wantDegraded []string wantErr bool }{ @@ -311,15 +310,13 @@ func TestGetHealthyMetrics(t *testing.T) { name: "mixed health states", selector: []string{"testcluster", "testnode"}, expectedMetrics: []string{"load", "mem_used", "cpu_user"}, - wantMissing: []string{"cpu_user"}, - wantDegraded: []string{"mem_used"}, + wantDegraded: []string{"mem_used", "cpu_user"}, wantErr: false, }, { name: "node not found", selector: []string{"testcluster", "nonexistent"}, expectedMetrics: []string{"load"}, - wantMissing: nil, wantDegraded: nil, wantErr: true, }, @@ -327,7 +324,6 @@ func TestGetHealthyMetrics(t *testing.T) { name: "check only healthy metric", selector: []string{"testcluster", "testnode"}, expectedMetrics: []string{"load"}, - wantMissing: []string{}, wantDegraded: []string{}, wantErr: false, }, @@ -335,7 +331,7 @@ func TestGetHealthyMetrics(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - missing, degraded, err := ms.GetHealthyMetrics(tt.selector, tt.expectedMetrics) + degraded, err := ms.GetHealthyMetrics(tt.selector, tt.expectedMetrics) if (err != nil) != tt.wantErr { t.Errorf("GetHealthyMetrics() error = %v, wantErr %v", err, tt.wantErr) @@ -346,17 +342,6 @@ func TestGetHealthyMetrics(t *testing.T) { return } - // Check missing list - if len(missing) != len(tt.wantMissing) { - t.Errorf("GetHealthyMetrics() missing = %v, want %v", missing, tt.wantMissing) - } else { - for i, m := range tt.wantMissing { - if missing[i] != m { - t.Errorf("GetHealthyMetrics() missing[%d] = %v, want %v", i, missing[i], m) - } - } - } - // Check degraded list if len(degraded) != len(tt.wantDegraded) { t.Errorf("GetHealthyMetrics() degraded = %v, want %v", degraded, tt.wantDegraded)