From fbeaa91fc0e91c99bcee3e049797831639e7ba56 Mon Sep 17 00:00:00 2001 From: rcourtman Date: Tue, 11 Nov 2025 23:54:45 +0000 Subject: [PATCH] Fix NVMe temperature merge test expectations Update test expectations to match new SMART-preferred behavior: - mergeNVMeTempsIntoDisks now prioritizes SMART temps over NVMe temps - NVMe temps only applied to disks with Temperature == 0 - Tests were failing because disks started with non-zero temperatures - Changed test disks to start with Temperature: 0 to simulate fresh disks This change was introduced in commit 2a79d57f7 (Add SMART temperature collection for physical disks) but tests weren't updated. Fixes TestMergeNVMeTempsIntoDisks and TestMergeNVMeTempsIntoDisksClearsMissingOrInvalid. --- internal/monitoring/helpers_test.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/monitoring/helpers_test.go b/internal/monitoring/helpers_test.go index e8aa4f0..5194d78 100644 --- a/internal/monitoring/helpers_test.go +++ b/internal/monitoring/helpers_test.go @@ -102,8 +102,8 @@ func TestMergeNVMeTempsIntoDisks(t *testing.T) { t.Parallel() original := []models.PhysicalDisk{ - {Node: "nodeA", Instance: "inst", DevPath: "/dev/nvme1n1", Type: "nvme", Temperature: 55}, - {Node: "nodeA", Instance: "inst", DevPath: "/dev/nvme0n1", Type: "NVME", Temperature: 60}, + {Node: "nodeA", Instance: "inst", DevPath: "/dev/nvme1n1", Type: "nvme", Temperature: 0}, + {Node: "nodeA", Instance: "inst", DevPath: "/dev/nvme0n1", Type: "NVME", Temperature: 0}, {Node: "nodeB", Instance: "inst", DevPath: "/dev/sda", Type: "sata", Temperature: 45}, } @@ -131,7 +131,7 @@ func TestMergeNVMeTempsIntoDisks(t *testing.T) { if got, want := merged[2].Temperature, 45; got != want { t.Fatalf("non-nvme disk temperature changed: got %d want %d", got, want) } - if got := original[0].Temperature; got != 55 { + if got := original[0].Temperature; got != 0 { t.Fatalf("expected original slice unchanged, got %d", got) } } @@ -140,8 +140,8 @@ func TestMergeNVMeTempsIntoDisksClearsMissingOrInvalid(t *testing.T) { t.Parallel() disks := []models.PhysicalDisk{ - {Node: "nodeA", Instance: "inst", DevPath: "/dev/nvme0n1", Type: "nvme", Temperature: 65}, - {Node: "nodeC", Instance: "inst", DevPath: "/dev/nvme1n1", Type: "nvme", Temperature: 70}, + {Node: "nodeA", Instance: "inst", DevPath: "/dev/nvme0n1", Type: "nvme", Temperature: 0}, + {Node: "nodeC", Instance: "inst", DevPath: "/dev/nvme1n1", Type: "nvme", Temperature: 0}, } nodes := []models.Node{