diff --git a/pkg/apis/core/validation/validation_test.go b/pkg/apis/core/validation/validation_test.go index d88335aae9e..3bce4261ac6 100644 --- a/pkg/apis/core/validation/validation_test.go +++ b/pkg/apis/core/validation/validation_test.go @@ -23726,7 +23726,7 @@ func TestValidateAppArmorProfileFormat(t *testing.T) { if test.expectValid { assert.NoError(t, err, "Profile %s should be valid", test.profile) } else { - assert.Error(t, err, fmt.Sprintf("Profile %s should not be valid", test.profile)) + assert.Errorf(t, err, "Profile %s should not be valid", test.profile) } } } diff --git a/pkg/kubelet/eviction/helpers_test.go b/pkg/kubelet/eviction/helpers_test.go index c8ec374c2bd..cff0e866ac7 100644 --- a/pkg/kubelet/eviction/helpers_test.go +++ b/pkg/kubelet/eviction/helpers_test.go @@ -786,7 +786,7 @@ func TestFallbackResourcesUsage(t *testing.T) { }, } { t.Run(test.description, func(t *testing.T) { - assert.NotEqual(t, 0, test.usageFunc(), fmt.Sprintf("%s: unexpected fallback value", test.usageFuncName)) + assert.NotEqualf(t, 0, test.usageFunc(), "%s: unexpected fallback value", test.usageFuncName) }) } } diff --git a/pkg/kubelet/kubelet_node_status_test.go b/pkg/kubelet/kubelet_node_status_test.go index 2df53690a8c..ff09ea9fdca 100644 --- a/pkg/kubelet/kubelet_node_status_test.go +++ b/pkg/kubelet/kubelet_node_status_test.go @@ -2704,8 +2704,7 @@ func TestValidateNodeIPParam(t *testing.T) { } addrs, err := net.InterfaceAddrs() if err != nil { - assert.Error(t, err, fmt.Sprintf( - "Unable to obtain a list of the node's unicast interface addresses.")) + assert.Errorf(t, err, "Unable to obtain a list of the node's unicast interface addresses.") } for _, addr := range addrs { var ip net.IP @@ -2728,9 +2727,9 @@ func TestValidateNodeIPParam(t *testing.T) { for _, test := range tests { err := validateNodeIP(netutils.ParseIPSloppy(test.nodeIP)) if test.success { - assert.NoError(t, err, "test %s", test.testName) + assert.NoErrorf(t, err, "test %s", test.testName) } else { - assert.Error(t, err, fmt.Sprintf("test %s", test.testName)) + assert.Errorf(t, err, "test %s", test.testName) } } } diff --git a/pkg/kubelet/kubelet_test.go b/pkg/kubelet/kubelet_test.go index 72b3bf00942..d3f93cdc126 100644 --- a/pkg/kubelet/kubelet_test.go +++ b/pkg/kubelet/kubelet_test.go @@ -1316,21 +1316,21 @@ func TestValidateContainerLogStatus(t *testing.T) { podStatus := &v1.PodStatus{ContainerStatuses: tc.statuses} _, err := kubelet.validateContainerLogStatus("podName", podStatus, containerName, previous) if !tc.success { - assert.Error(t, err, fmt.Sprintf("[case %d] error", i)) + assert.Errorf(t, err, "[case %d] error", i) } else { - assert.NoError(t, err, "[case %d] error", i) + assert.NoErrorf(t, err, "[case %d] error", i) } // Access the log of the previous, terminated container previous = true _, err = kubelet.validateContainerLogStatus("podName", podStatus, containerName, previous) if !tc.pSuccess { - assert.Error(t, err, fmt.Sprintf("[case %d] error", i)) + assert.Errorf(t, err, "[case %d] error", i) } else { - assert.NoError(t, err, "[case %d] error", i) + assert.NoErrorf(t, err, "[case %d] error", i) } // Access the log of a container that's not in the pod _, err = kubelet.validateContainerLogStatus("podName", podStatus, "blah", false) - assert.Error(t, err, fmt.Sprintf("[case %d] invalid container name should cause an error", i)) + assert.Errorf(t, err, "[case %d] invalid container name should cause an error", i) } } @@ -3267,10 +3267,10 @@ func TestSyncPodSpans(t *testing.T) { assert.NotEmpty(t, runtimeServiceSpans, "syncPod trace should have runtime service spans") for _, span := range imageServiceSpans { - assert.Equal(t, span.Parent.SpanID(), rootSpan.SpanContext.SpanID(), fmt.Sprintf("image service span %s %s should be child of root span", span.Name, span.Parent.SpanID())) + assert.Equalf(t, span.Parent.SpanID(), rootSpan.SpanContext.SpanID(), "image service span %s %s should be child of root span", span.Name, span.Parent.SpanID()) } for _, span := range runtimeServiceSpans { - assert.Equal(t, span.Parent.SpanID(), rootSpan.SpanContext.SpanID(), fmt.Sprintf("runtime service span %s %s should be child of root span", span.Name, span.Parent.SpanID())) + assert.Equalf(t, span.Parent.SpanID(), rootSpan.SpanContext.SpanID(), "runtime service span %s %s should be child of root span", span.Name, span.Parent.SpanID()) } } diff --git a/pkg/kubelet/server/server_test.go b/pkg/kubelet/server/server_test.go index 5c334eacd6d..0f10ecba9fd 100644 --- a/pkg/kubelet/server/server_test.go +++ b/pkg/kubelet/server/server_test.go @@ -1525,6 +1525,6 @@ func TestTrimURLPath(t *testing.T) { } for _, test := range tests { - assert.Equal(t, test.expected, getURLRootPath(test.path), fmt.Sprintf("path is: %s", test.path)) + assert.Equalf(t, test.expected, getURLRootPath(test.path), "path is: %s", test.path) } } diff --git a/pkg/proxy/ipvs/proxier_test.go b/pkg/proxy/ipvs/proxier_test.go index 4058a5fccc0..7b20431733e 100644 --- a/pkg/proxy/ipvs/proxier_test.go +++ b/pkg/proxy/ipvs/proxier_test.go @@ -4811,7 +4811,7 @@ func TestTestInternalTrafficPolicyE2E(t *testing.T) { realServers1, rsErr1 := ipvs.GetRealServers(virtualServers1[0]) assert.NoError(t, rsErr1, "Expected no error getting real servers") - assert.Len(t, realServers1, tc.expectLocalRealServerNum, fmt.Sprintf("Expected %d real servers", tc.expectLocalRealServerNum)) + assert.Lenf(t, realServers1, tc.expectLocalRealServerNum, "Expected %d real servers", tc.expectLocalRealServerNum) for i := 0; i < tc.expectLocalRealServerNum; i++ { assert.Equal(t, realServers1[i].String(), tc.expectLocalRealServers[i]) } diff --git a/pkg/security/apparmor/validate_test.go b/pkg/security/apparmor/validate_test.go index 58cf7d93fd8..0b5782203aa 100644 --- a/pkg/security/apparmor/validate_test.go +++ b/pkg/security/apparmor/validate_test.go @@ -18,7 +18,6 @@ package apparmor import ( "errors" - "fmt" "testing" v1 "k8s.io/api/core/v1" @@ -45,9 +44,9 @@ func TestValidateBadHost(t *testing.T) { for _, test := range tests { err := v.Validate(getPodWithProfile(test.profile)) if test.expectValid { - assert.NoError(t, err, "Pod with profile %q should be valid", test.profile) + assert.NoErrorf(t, err, "Pod with profile %q should be valid", test.profile) } else { - assert.Equal(t, hostErr, err, "Pod with profile %q should trigger a host validation error", test.profile) + assert.Equalf(t, hostErr, err, "Pod with profile %q should trigger a host validation error", test.profile) } } } @@ -71,9 +70,9 @@ func TestValidateValidHost(t *testing.T) { for _, test := range tests { err := v.Validate(getPodWithProfile(test.profile)) if test.expectValid { - assert.NoError(t, err, "Pod with profile %q should be valid", test.profile) + assert.NoErrorf(t, err, "Pod with profile %q should be valid", test.profile) } else { - assert.Error(t, err, fmt.Sprintf("Pod with profile %q should trigger a validation error", test.profile)) + assert.Errorf(t, err, "Pod with profile %q should trigger a validation error", test.profile) } }