From af5741da5fcc29dc32c88ee576d0ef59b95ce9f3 Mon Sep 17 00:00:00 2001 From: Mads Jensen Date: Sat, 31 Jan 2026 09:13:26 +0100 Subject: [PATCH] Fix cases of nilness under pkg/controller. --- pkg/controller/statefulset/stateful_set_control_test.go | 5 +---- .../attachdetach/cache/actual_state_of_world_test.go | 9 +++------ 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/pkg/controller/statefulset/stateful_set_control_test.go b/pkg/controller/statefulset/stateful_set_control_test.go index 734572e86d4..60726b77e89 100644 --- a/pkg/controller/statefulset/stateful_set_control_test.go +++ b/pkg/controller/statefulset/stateful_set_control_test.go @@ -886,7 +886,7 @@ func TestStatefulSetControl_getSetRevisions(t *testing.T) { if len(revisions) != test.expectedCount { t.Errorf("%s: want %d revisions got %d", test.name, test.expectedCount, len(revisions)) } - if test.err && err == nil { + if test.err { t.Errorf("%s: expected error", test.name) } if !test.err && !history.EqualRevision(current, test.expectedCurrent) { @@ -2092,9 +2092,6 @@ func TestStatefulSetControlRollback(t *testing.T) { if err := updateStatefulSetControl(set, ssc, om, assertUpdateInvariants); err != nil { t.Fatalf("%s: %s", test.name, err) } - if err != nil { - t.Fatalf("%s: %s", test.name, err) - } pods, err = om.podsLister.Pods(set.Namespace).List(selector) if err != nil { t.Fatalf("%s: %s", test.name, err) diff --git a/pkg/controller/volume/attachdetach/cache/actual_state_of_world_test.go b/pkg/controller/volume/attachdetach/cache/actual_state_of_world_test.go index 1e4afa312d6..5e800190938 100644 --- a/pkg/controller/volume/attachdetach/cache/actual_state_of_world_test.go +++ b/pkg/controller/volume/attachdetach/cache/actual_state_of_world_test.go @@ -629,7 +629,7 @@ func Test_GetAttachedVolumes_Positive_OneVolumeTwoNodes(t *testing.T) { t.Fatalf("Failed to get volume plugin from spec %v, %v", volumeSpec, err) } uniqueVolumeName, err := volumeutil.GetUniqueVolumeNameFromSpec(plugin, volumeSpec) - if err != nil || plugin == nil { + if err != nil || uniqueVolumeName == "" { t.Fatalf("Failed to get uniqueVolumeName from spec %v, %v", volumeSpec, err) } logger, _ := ktesting.NewTestContext(t) @@ -927,9 +927,6 @@ func Test_MarkDesireToDetach_Positive_MarkedAddVolumeNodeReset(t *testing.T) { if markDesireToDetachErr != nil { t.Fatalf("RemoveVolumeFromReportAsAttached failed. Expected: Actual: <%v>", markDesireToDetachErr) } - if addErr != nil { - t.Fatalf("AddVolumeNode failed. Expected: Actual: <%v>", addErr) - } // Assert attachedVolumes := asw.GetAttachedVolumes() @@ -1224,7 +1221,7 @@ func Test_GetAttachedVolumesForNode_Positive_OneVolumeTwoNodes(t *testing.T) { t.Fatalf("Failed to get volume plugin from spec %v, %v", volumeSpec, err) } uniqueVolumeName, err := volumeutil.GetUniqueVolumeNameFromSpec(plugin, volumeSpec) - if err != nil || plugin == nil { + if err != nil || uniqueVolumeName == "" { t.Fatalf("Failed to get uniqueVolumeName from spec %v, %v", volumeSpec, err) } generatedVolumeName1, add1Err := asw.AddVolumeNode(logger, uniqueVolumeName, volumeSpec, node1Name, devicePath, true) @@ -1269,7 +1266,7 @@ func Test_OneVolumeTwoNodes_TwoDevicePaths(t *testing.T) { t.Fatalf("Failed to get volume plugin from spec %v, %v", volumeSpec, err) } uniqueVolumeName, err := volumeutil.GetUniqueVolumeNameFromSpec(plugin, volumeSpec) - if err != nil || plugin == nil { + if err != nil || uniqueVolumeName == "" { t.Fatalf("Failed to get uniqueVolumeName from spec %v, %v", volumeSpec, err) } generatedVolumeName1, add1Err := asw.AddVolumeNode(logger, uniqueVolumeName, volumeSpec, node1Name, devicePath1, true)