diff --git a/pkg/kubelet/cm/devicemanager/manager_test.go b/pkg/kubelet/cm/devicemanager/manager_test.go index 5178cb4c08f..38add8678e7 100644 --- a/pkg/kubelet/cm/devicemanager/manager_test.go +++ b/pkg/kubelet/cm/devicemanager/manager_test.go @@ -1099,9 +1099,9 @@ func TestPodContainerDeviceAllocation(t *testing.T) { if testCase.expectedContainerOptsLen == nil { as.Nil(runContainerOpts) } else { - as.Equal(len(runContainerOpts.Devices), testCase.expectedContainerOptsLen[0]) - as.Equal(len(runContainerOpts.Mounts), testCase.expectedContainerOptsLen[1]) - as.Equal(len(runContainerOpts.Envs), testCase.expectedContainerOptsLen[2]) + as.Len(runContainerOpts.Devices, testCase.expectedContainerOptsLen[0]) + as.Len(runContainerOpts.Mounts, testCase.expectedContainerOptsLen[1]) + as.Len(runContainerOpts.Envs, testCase.expectedContainerOptsLen[2]) } as.Equal(testCase.expectedAllocatedResName1, testManager.allocatedDevices[res1.resourceName].Len()) as.Equal(testCase.expectedAllocatedResName2, testManager.allocatedDevices[res2.resourceName].Len()) @@ -1275,7 +1275,7 @@ func TestDevicesToAllocateConflictWithUpdateAllocatedDevices(t *testing.T) { set, err := testManager.devicesToAllocate(tCtx, podToAllocate, containerToAllocate, resourceName, 1, sets.New[string]()) assert.NoError(t, err) - assert.Equal(t, set, sets.New[string](deviceID)) + assert.Equal(t, sets.New[string](deviceID), set) } func TestGetDeviceRunContainerOptions(t *testing.T) { @@ -1675,15 +1675,15 @@ func TestDevicePreStartContainer(t *testing.T) { as.Contains(initializedDevs, "dev1") as.Contains(initializedDevs, "dev2") - as.Equal(len(initializedDevs), res1.devs.Devices().Len()) + as.Len(initializedDevs, res1.devs.Devices().Len()) expectedResps, err := allocateStubFunc()([]string{"dev1", "dev2"}) as.NoError(err) as.Len(expectedResps.ContainerResponses, 1) expectedResp := expectedResps.ContainerResponses[0] - as.Equal(len(runContainerOpts.Devices), len(expectedResp.Devices)) - as.Equal(len(runContainerOpts.Mounts), len(expectedResp.Mounts)) - as.Equal(len(runContainerOpts.Envs), len(expectedResp.Envs)) + as.Len(runContainerOpts.Devices, len(expectedResp.Devices)) + as.Len(runContainerOpts.Mounts, len(expectedResp.Mounts)) + as.Len(runContainerOpts.Envs, len(expectedResp.Envs)) pod2 := makePod(v1.ResourceList{ v1.ResourceName(res1.resourceName): *resource.NewQuantity(int64(0), resource.DecimalSI)}) diff --git a/pkg/kubelet/kubelet_pods_test.go b/pkg/kubelet/kubelet_pods_test.go index 119270572ba..7a50743b19e 100644 --- a/pkg/kubelet/kubelet_pods_test.go +++ b/pkg/kubelet/kubelet_pods_test.go @@ -361,7 +361,7 @@ func TestRunInContainer(t *testing.T) { assert.Equal(t, cmd, fakeCommandRunner.Cmd, "(testError=%v) command", testError) // this isn't 100% foolproof as a bug in a real CommandRunner where it fails to copy to stdout/stderr wouldn't be caught by this test assert.Equal(t, "foo", string(actualOutput), "(testError=%v) output", testError) - assert.Equal(t, err, testError, "(testError=%v) err", testError) + assert.Equal(t, testError, err, "(testError=%v) err", testError) } } diff --git a/pkg/kubelet/server/stats/summary_windows_test.go b/pkg/kubelet/server/stats/summary_windows_test.go index a31953d7e52..07d9c02c0e3 100644 --- a/pkg/kubelet/server/stats/summary_windows_test.go +++ b/pkg/kubelet/server/stats/summary_windows_test.go @@ -70,23 +70,23 @@ func TestSummaryProvider(t *testing.T) { summary, err := provider.Get(ctx, true) assert.NoError(err) - assert.Equal(summary.Node.NodeName, "test-node") - assert.Equal(summary.Node.StartTime, systemBootTime) - assert.Equal(summary.Node.CPU, cgroupStatsMap["/"].cs.CPU) - assert.Equal(summary.Node.Memory, cgroupStatsMap["/"].cs.Memory) - assert.Equal(summary.Node.Network, cgroupStatsMap["/"].ns) - assert.Equal(summary.Node.Fs, rootFsStats) - assert.Equal(summary.Node.Runtime, &statsapi.RuntimeStats{ContainerFs: imageFsStats, ImageFs: imageFsStats}) + assert.Equal("test-node", summary.Node.NodeName) + assert.Equal(systemBootTime, summary.Node.StartTime) + assert.Equal(cgroupStatsMap["/"].cs.CPU, summary.Node.CPU) + assert.Equal(cgroupStatsMap["/"].cs.Memory, summary.Node.Memory) + assert.Equal(cgroupStatsMap["/"].ns, summary.Node.Network) + assert.Equal(rootFsStats, summary.Node.Fs) + assert.Equal(&statsapi.RuntimeStats{ContainerFs: imageFsStats, ImageFs: imageFsStats}, summary.Node.Runtime) assert.NoError(err) - assert.Equal(len(summary.Node.SystemContainers), 2) - assert.Equal(summary.Node.SystemContainers[0].Name, "pods") - assert.Equal(summary.Node.SystemContainers[0].CPU.UsageCoreNanoSeconds, podStats[0].CPU.UsageCoreNanoSeconds) - assert.Equal(summary.Node.SystemContainers[0].CPU.UsageNanoCores, podStats[0].CPU.UsageNanoCores) - assert.Equal(summary.Node.SystemContainers[0].Memory.WorkingSetBytes, podStats[0].Memory.WorkingSetBytes) - assert.Equal(summary.Node.SystemContainers[0].Memory.UsageBytes, podStats[0].Memory.UsageBytes) - assert.Equal(summary.Node.SystemContainers[0].Memory.AvailableBytes, podStats[0].Memory.AvailableBytes) - assert.Equal(summary.Node.SystemContainers[1].Name, statsapi.SystemContainerWindowsGlobalCommitMemory) + assert.Len(summary.Node.SystemContainers, 2) + assert.Equal("pods", summary.Node.SystemContainers[0].Name) + assert.Equal(podStats[0].CPU.UsageCoreNanoSeconds, summary.Node.SystemContainers[0].CPU.UsageCoreNanoSeconds) + assert.Equal(podStats[0].CPU.UsageNanoCores, summary.Node.SystemContainers[0].CPU.UsageNanoCores) + assert.Equal(podStats[0].Memory.WorkingSetBytes, summary.Node.SystemContainers[0].Memory.WorkingSetBytes) + assert.Equal(podStats[0].Memory.UsageBytes, summary.Node.SystemContainers[0].Memory.UsageBytes) + assert.Equal(podStats[0].Memory.AvailableBytes, summary.Node.SystemContainers[0].Memory.AvailableBytes) + assert.Equal(statsapi.SystemContainerWindowsGlobalCommitMemory, summary.Node.SystemContainers[1].Name) assert.NotEqual(nil, summary.Node.SystemContainers[1].Memory) assert.NotEqual(nil, summary.Node.SystemContainers[1].Memory.AvailableBytes) assert.NotEqual(nil, summary.Node.SystemContainers[1].Memory.UsageBytes)