Merge pull request kubernetes#127552 from mmorel-35/testifylint/[email protected]/kubernetes

fix: enable nil-compare and error-nil rules from testifylint in module `k8s.io/kubernetes`

Author: k8s-ci-robot

pkg/kubelet/cm/devicemanager/manager_test.go

@@ -348,7 +348,7 @@ func TestUpdateCapacityAllocatable(t *testing.T) {
 	testManager, err := newManagerImpl(socketName, nil, topologyStore)
 	as := assert.New(t)
 	as.NotNil(testManager)
-	as.Nil(err)
+	as.NoError(err)
 
 	devs := []pluginapi.Device{
 		{ID: "Device1", Health: pluginapi.Healthy},
@@ -464,11 +464,11 @@ func TestUpdateCapacityAllocatable(t *testing.T) {
 	// during the time of propagating capacity change to the scheduler will be
 	// properly rejected instead of being incorrectly started.
 	err = testManager.writeCheckpoint()
-	as.Nil(err)
+	as.NoError(err)
 	testManager.healthyDevices = make(map[string]sets.Set[string])
 	testManager.unhealthyDevices = make(map[string]sets.Set[string])
 	err = testManager.readCheckpoint()
-	as.Nil(err)
+	as.NoError(err)
 	as.Len(testManager.endpoints, 1)
 	as.Contains(testManager.endpoints, resourceName2)
 	capacity, allocatable, removed = testManager.GetCapacity()
@@ -490,7 +490,7 @@ func TestGetAllocatableDevicesMultipleResources(t *testing.T) {
 	testManager, err := newManagerImpl(socketName, nil, topologyStore)
 	as := assert.New(t)
 	as.NotNil(testManager)
-	as.Nil(err)
+	as.NoError(err)
 
 	resource1Devs := []pluginapi.Device{
 		{ID: "R1Device1", Health: pluginapi.Healthy},
@@ -531,7 +531,7 @@ func TestGetAllocatableDevicesHealthTransition(t *testing.T) {
 	testManager, err := newManagerImpl(socketName, nil, topologyStore)
 	as := assert.New(t)
 	as.NotNil(testManager)
-	as.Nil(err)
+	as.NoError(err)
 
 	resource1Devs := []pluginapi.Device{
 		{ID: "R1Device1", Health: pluginapi.Healthy},
@@ -673,10 +673,10 @@ func TestCheckpoint(t *testing.T) {
 	resourceName3 := "domain2.com/resource3"
 	as := assert.New(t)
 	tmpDir, err := os.MkdirTemp("", "checkpoint")
-	as.Nil(err)
+	as.NoError(err)
 	defer os.RemoveAll(tmpDir)
 	ckm, err := checkpointmanager.NewCheckpointManager(tmpDir)
-	as.Nil(err)
+	as.NoError(err)
 	testManager := &ManagerImpl{
 		endpoints:         make(map[string]endpointInfo),
 		healthyDevices:    make(map[string]sets.Set[string]),
@@ -742,10 +742,10 @@ func TestCheckpoint(t *testing.T) {
 
 	err = testManager.writeCheckpoint()
 
-	as.Nil(err)
+	as.NoError(err)
 	testManager.podDevices = newPodDevices()
 	err = testManager.readCheckpoint()
-	as.Nil(err)
+	as.NoError(err)
 
 	as.Equal(expectedPodDevices.size(), testManager.podDevices.size())
 	for podUID, containerDevices := range expectedPodDevices.devs {
@@ -1007,10 +1007,10 @@ func TestPodContainerDeviceAllocation(t *testing.T) {
 		activePods: []*v1.Pod{},
 	}
 	tmpDir, err := os.MkdirTemp("", "checkpoint")
-	as.Nil(err)
+	as.NoError(err)
 	defer os.RemoveAll(tmpDir)
 	testManager, err := getTestManager(tmpDir, podsStub.getActivePods, testResources)
-	as.Nil(err)
+	as.NoError(err)
 
 	testPods := []*v1.Pod{
 		makePod(v1.ResourceList{
@@ -1067,7 +1067,7 @@ func TestPodContainerDeviceAllocation(t *testing.T) {
 		}
 		runContainerOpts, err := testManager.GetDeviceRunContainerOptions(pod, &pod.Spec.Containers[0])
 		if testCase.expErr == nil {
-			as.Nil(err)
+			as.NoError(err)
 		}
 		if testCase.expectedContainerOptsLen == nil {
 			as.Nil(runContainerOpts)
@@ -1088,7 +1088,7 @@ func TestPodContainerDeviceToAllocate(t *testing.T) {
 	resourceName3 := "domain2.com/resource3"
 	as := require.New(t)
 	tmpDir, err := os.MkdirTemp("", "checkpoint")
-	as.Nil(err)
+	as.NoError(err)
 	defer os.RemoveAll(tmpDir)
 
 	testManager := &ManagerImpl{
@@ -1273,11 +1273,11 @@ func TestGetDeviceRunContainerOptions(t *testing.T) {
 	as := require.New(t)
 
 	tmpDir, err := os.MkdirTemp("", "checkpoint")
-	as.Nil(err)
+	as.NoError(err)
 	defer os.RemoveAll(tmpDir)
 
 	testManager, err := getTestManager(tmpDir, podsStub.getActivePods, testResources)
-	as.Nil(err)
+	as.NoError(err)
 
 	pod1 := makePod(v1.ResourceList{
 		v1.ResourceName(res1.resourceName): res1.resourceQuantity,
@@ -1291,13 +1291,13 @@ func TestGetDeviceRunContainerOptions(t *testing.T) {
 	podsStub.updateActivePods(activePods)
 
 	err = testManager.Allocate(pod1, &pod1.Spec.Containers[0])
-	as.Nil(err)
+	as.NoError(err)
 	err = testManager.Allocate(pod2, &pod2.Spec.Containers[0])
-	as.Nil(err)
+	as.NoError(err)
 
 	// when pod is in activePods, GetDeviceRunContainerOptions should return
 	runContainerOpts, err := testManager.GetDeviceRunContainerOptions(pod1, &pod1.Spec.Containers[0])
-	as.Nil(err)
+	as.NoError(err)
 	as.Len(runContainerOpts.Devices, 3)
 	as.Len(runContainerOpts.Mounts, 2)
 	as.Len(runContainerOpts.Envs, 2)
@@ -1308,7 +1308,7 @@ func TestGetDeviceRunContainerOptions(t *testing.T) {
 
 	// when pod is removed from activePods,G etDeviceRunContainerOptions should return error
 	runContainerOpts, err = testManager.GetDeviceRunContainerOptions(pod1, &pod1.Spec.Containers[0])
-	as.Nil(err)
+	as.NoError(err)
 	as.Nil(runContainerOpts)
 }
 
@@ -1335,11 +1335,11 @@ func TestInitContainerDeviceAllocation(t *testing.T) {
 		activePods: []*v1.Pod{},
 	}
 	tmpDir, err := os.MkdirTemp("", "checkpoint")
-	as.Nil(err)
+	as.NoError(err)
 	defer os.RemoveAll(tmpDir)
 
 	testManager, err := getTestManager(tmpDir, podsStub.getActivePods, testResources)
-	as.Nil(err)
+	as.NoError(err)
 
 	podWithPluginResourcesInInitContainers := &v1.Pod{
 		ObjectMeta: metav1.ObjectMeta{
@@ -1393,7 +1393,7 @@ func TestInitContainerDeviceAllocation(t *testing.T) {
 	for _, container := range podWithPluginResourcesInInitContainers.Spec.Containers {
 		err = testManager.Allocate(podWithPluginResourcesInInitContainers, &container)
 	}
-	as.Nil(err)
+	as.NoError(err)
 	podUID := string(podWithPluginResourcesInInitContainers.UID)
 	initCont1 := podWithPluginResourcesInInitContainers.Spec.InitContainers[0].Name
 	initCont2 := podWithPluginResourcesInInitContainers.Spec.InitContainers[1].Name
@@ -1436,11 +1436,11 @@ func TestRestartableInitContainerDeviceAllocation(t *testing.T) {
 		activePods: []*v1.Pod{},
 	}
 	tmpDir, err := os.MkdirTemp("", "checkpoint")
-	as.Nil(err)
+	as.NoError(err)
 	defer os.RemoveAll(tmpDir)
 
 	testManager, err := getTestManager(tmpDir, podsStub.getActivePods, testResources)
-	as.Nil(err)
+	as.NoError(err)
 
 	containerRestartPolicyAlways := v1.ContainerRestartPolicyAlways
 	podWithPluginResourcesInRestartableInitContainers := &v1.Pod{
@@ -1503,7 +1503,7 @@ func TestRestartableInitContainerDeviceAllocation(t *testing.T) {
 	for _, container := range podWithPluginResourcesInRestartableInitContainers.Spec.Containers {
 		err = testManager.Allocate(podWithPluginResourcesInRestartableInitContainers, &container)
 	}
-	as.Nil(err)
+	as.NoError(err)
 	podUID := string(podWithPluginResourcesInRestartableInitContainers.UID)
 	regularInitCont1 := podWithPluginResourcesInRestartableInitContainers.Spec.InitContainers[0].Name
 	restartableInitCont2 := podWithPluginResourcesInRestartableInitContainers.Spec.InitContainers[1].Name
@@ -1553,11 +1553,11 @@ func TestUpdatePluginResources(t *testing.T) {
 	as := assert.New(t)
 	monitorCallback := func(resourceName string, devices []pluginapi.Device) {}
 	tmpDir, err := os.MkdirTemp("", "checkpoint")
-	as.Nil(err)
+	as.NoError(err)
 	defer os.RemoveAll(tmpDir)
 
 	ckm, err := checkpointmanager.NewCheckpointManager(tmpDir)
-	as.Nil(err)
+	as.NoError(err)
 	m := &ManagerImpl{
 		allocatedDevices:  make(map[string]sets.Set[string]),
 		healthyDevices:    make(map[string]sets.Set[string]),
@@ -1611,11 +1611,11 @@ func TestDevicePreStartContainer(t *testing.T) {
 		activePods: []*v1.Pod{},
 	}
 	tmpDir, err := os.MkdirTemp("", "checkpoint")
-	as.Nil(err)
+	as.NoError(err)
 	defer os.RemoveAll(tmpDir)
 
 	testManager, err := getTestManager(tmpDir, podsStub.getActivePods, []TestResource{res1})
-	as.Nil(err)
+	as.NoError(err)
 
 	ch := make(chan []string, 1)
 	testManager.endpoints[res1.resourceName] = endpointInfo{
@@ -1631,9 +1631,9 @@ func TestDevicePreStartContainer(t *testing.T) {
 	activePods = append(activePods, pod)
 	podsStub.updateActivePods(activePods)
 	err = testManager.Allocate(pod, &pod.Spec.Containers[0])
-	as.Nil(err)
+	as.NoError(err)
 	runContainerOpts, err := testManager.GetDeviceRunContainerOptions(pod, &pod.Spec.Containers[0])
-	as.Nil(err)
+	as.NoError(err)
 	var initializedDevs []string
 	select {
 	case <-time.After(time.Second):
@@ -1647,7 +1647,7 @@ func TestDevicePreStartContainer(t *testing.T) {
 	as.Equal(len(initializedDevs), res1.devs.Devices().Len())
 
 	expectedResps, err := allocateStubFunc()([]string{"dev1", "dev2"})
-	as.Nil(err)
+	as.NoError(err)
 	as.Len(expectedResps.ContainerResponses, 1)
 	expectedResp := expectedResps.ContainerResponses[0]
 	as.Equal(len(runContainerOpts.Devices), len(expectedResp.Devices))
@@ -1659,9 +1659,9 @@ func TestDevicePreStartContainer(t *testing.T) {
 	activePods = append(activePods, pod2)
 	podsStub.updateActivePods(activePods)
 	err = testManager.Allocate(pod2, &pod2.Spec.Containers[0])
-	as.Nil(err)
+	as.NoError(err)
 	_, err = testManager.GetDeviceRunContainerOptions(pod2, &pod2.Spec.Containers[0])
-	as.Nil(err)
+	as.NoError(err)
 	select {
 	case <-time.After(time.Millisecond):
 		t.Log("When pod resourceQuantity is 0,  PreStartContainer RPC stub will be skipped")
@@ -1673,10 +1673,10 @@ func TestDevicePreStartContainer(t *testing.T) {
 func TestResetExtendedResource(t *testing.T) {
 	as := assert.New(t)
 	tmpDir, err := os.MkdirTemp("", "checkpoint")
-	as.Nil(err)
+	as.NoError(err)
 	defer os.RemoveAll(tmpDir)
 	ckm, err := checkpointmanager.NewCheckpointManager(tmpDir)
-	as.Nil(err)
+	as.NoError(err)
 	testManager := &ManagerImpl{
 		endpoints:         make(map[string]endpointInfo),
 		healthyDevices:    make(map[string]sets.Set[string]),
@@ -1699,16 +1699,16 @@ func TestResetExtendedResource(t *testing.T) {
 	testManager.healthyDevices[extendedResourceName].Insert("dev1")
 	// checkpoint is present, indicating node hasn't been recreated
 	err = testManager.writeCheckpoint()
-	as.Nil(err)
+	require.NoError(t, err)
 
 	as.False(testManager.ShouldResetExtendedResourceCapacity())
 
 	// checkpoint is absent, representing node recreation
 	ckpts, err := ckm.ListCheckpoints()
-	as.Nil(err)
+	as.NoError(err)
 	for _, ckpt := range ckpts {
 		err = ckm.RemoveCheckpoint(ckpt)
-		as.Nil(err)
+		as.NoError(err)
 	}
 	as.True(testManager.ShouldResetExtendedResourceCapacity())
 }

pkg/kubelet/cm/qos_container_manager_linux_test.go

@@ -129,7 +129,7 @@ func createTestQOSContainerManager() (*qosContainerManagerImpl, error) {
 
 func TestQoSContainerCgroup(t *testing.T) {
 	m, err := createTestQOSContainerManager()
-	assert.Nil(t, err)
+	assert.NoError(t, err)
 
 	qosConfigs := map[v1.PodQOSClass]*CgroupConfig{
 		v1.PodQOSGuaranteed: {

pkg/kubelet/container/cache_test.go

@@ -157,7 +157,7 @@ func TestCacheGetPodDoesNotExist(t *testing.T) {
 	// object with id filled.
 	actualStatus, actualErr := cache.Get(podID)
 	assert.Equal(t, status, actualStatus)
-	assert.Equal(t, nil, actualErr)
+	assert.NoError(t, actualErr)
 }
 
 func TestDelete(t *testing.T) {
@@ -167,13 +167,13 @@ func TestDelete(t *testing.T) {
 	cache.Set(podID, status, nil, time.Time{})
 	actualStatus, actualErr := cache.Get(podID)
 	assert.Equal(t, status, actualStatus)
-	assert.Equal(t, nil, actualErr)
+	assert.NoError(t, actualErr)
 	// Delete the pod from cache, and verify that we get an empty status.
 	cache.Delete(podID)
 	expectedStatus := &PodStatus{ID: podID}
 	actualStatus, actualErr = cache.Get(podID)
 	assert.Equal(t, expectedStatus, actualStatus)
-	assert.Equal(t, nil, actualErr)
+	assert.NoError(t, actualErr)
 }
 
 func verifyNotification(t *testing.T, ch chan *data, expectNotification bool) {

pkg/kubelet/images/image_gc_manager_test.go

@@ -644,7 +644,7 @@ func TestGarbageCollectCadvisorFailure(t *testing.T) {
 	manager, _ := newRealImageGCManager(policy, mockStatsProvider)
 
 	mockStatsProvider.EXPECT().ImageFsStats(mock.Anything).Return(&statsapi.FsStats{}, &statsapi.FsStats{}, fmt.Errorf("error"))
-	assert.NotNil(t, manager.GarbageCollect(ctx, time.Now()))
+	assert.Error(t, manager.GarbageCollect(ctx, time.Now()))
 }
 
 func TestGarbageCollectBelowSuccess(t *testing.T) {
@@ -689,7 +689,7 @@ func TestGarbageCollectNotEnoughFreed(t *testing.T) {
 		makeImage(0, 50),
 	}
 
-	assert.NotNil(t, manager.GarbageCollect(ctx, time.Now()))
+	assert.Error(t, manager.GarbageCollect(ctx, time.Now()))
 }
 
 func TestGarbageCollectImageNotOldEnough(t *testing.T) {

pkg/kubelet/images/image_manager_test.go

@@ -584,7 +584,7 @@ func TestMaxParallelImagePullsLimit(t *testing.T) {
 		wg.Add(1)
 		go func() {
 			_, _, err := puller.EnsureImageExists(ctx, nil, pod, container.Image, nil, nil, "", container.ImagePullPolicy)
-			assert.Nil(t, err)
+			assert.NoError(t, err)
 			wg.Done()
 		}()
 	}
@@ -596,7 +596,7 @@ func TestMaxParallelImagePullsLimit(t *testing.T) {
 		wg.Add(1)
 		go func() {
 			_, _, err := puller.EnsureImageExists(ctx, nil, pod, container.Image, nil, nil, "", container.ImagePullPolicy)
-			assert.Nil(t, err)
+			assert.NoError(t, err)
 			wg.Done()
 		}()
 	}

pkg/kubelet/kubelet_resources_test.go

@@ -21,7 +21,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 	apiequality "k8s.io/apimachinery/pkg/api/equality"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -69,7 +69,7 @@ func TestPodResourceLimitsDefaulting(t *testing.T) {
 	as := assert.New(t)
 	for idx, tc := range cases {
 		actual, _, err := tk.kubelet.defaultPodLimitsForDownwardAPI(tc.pod, nil)
-		as.Nil(err, "failed to default pod limits: %v", err)
+		as.NoError(err, "failed to default pod limits: %v", err)
 		if !apiequality.Semantic.DeepEqual(tc.expected, actual) {
 			as.Fail("test case [%d] failed.  Expected: %+v, Got: %+v", idx, tc.expected, actual)
 		}

pkg/kubelet/kuberuntime/kuberuntime_sandbox_test.go

@@ -467,7 +467,7 @@ func TestGeneratePodSandboxWindowsConfig_HostNetwork(t *testing.T) {
 			wc, err := m.generatePodSandboxWindowsConfig(pod)
 
 			assert.Equal(t, testCase.expectedWindowsConfig, wc)
-			assert.Equal(t, nil, err)
+			assert.NoError(t, err)
 		})
 	}
 }