diff --git a/pkg/kubelet/apis/podresources/server_v1_test.go b/pkg/kubelet/apis/podresources/server_v1_test.go index 4d342101d2f..0852d7040d0 100644 --- a/pkg/kubelet/apis/podresources/server_v1_test.go +++ b/pkg/kubelet/apis/podresources/server_v1_test.go @@ -705,12 +705,13 @@ func TestGetPodResourcesV1(t *testing.T) { server := NewV1PodResourcesServer(providers) podReq := &podresourcesapi.GetPodResourcesRequest{PodName: podName, PodNamespace: podNamespace} resp, err := server.Get(context.TODO(), podReq) + if err != nil { if err.Error() != tc.err.Error() { t.Errorf("want exit = %v, got %v", tc.err, err) } } else { - if err != err { + if err != tc.err { t.Errorf("want exit = %v, got %v", tc.err, err) } else { if !equalGetResponse(tc.expectedResponse, resp) { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/events/events_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/events/events_test.go index fdf448b48d5..7607f8aff2b 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/events/events_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/events/events_test.go @@ -110,7 +110,7 @@ func TestEventIsSorted(t *testing.T) { codec := scheme.Codecs.LegacyCodec(scheme.Scheme.PrioritizedVersionsAllGroups()...) streams, _, buf, _ := genericiooptions.NewTestIOStreams() clientset, err := kubernetes.NewForConfig(cmdtesting.DefaultClientConfig()) - if err != err { + if err != nil { t.Fatal(err) } @@ -148,7 +148,7 @@ func TestEventNoHeaders(t *testing.T) { codec := scheme.Codecs.LegacyCodec(scheme.Scheme.PrioritizedVersionsAllGroups()...) streams, _, buf, _ := genericiooptions.NewTestIOStreams() clientset, err := kubernetes.NewForConfig(cmdtesting.DefaultClientConfig()) - if err != err { + if err != nil { t.Fatal(err) } @@ -185,7 +185,7 @@ func TestEventFiltered(t *testing.T) { codec := scheme.Codecs.LegacyCodec(scheme.Scheme.PrioritizedVersionsAllGroups()...) streams, _, buf, _ := genericiooptions.NewTestIOStreams() clientset, err := kubernetes.NewForConfig(cmdtesting.DefaultClientConfig()) - if err != err { + if err != nil { t.Fatal(err) }