From d680bc540b5703510c95b9290bfb4317edc7b2e9 Mon Sep 17 00:00:00 2001 From: ithrael Date: Sun, 27 Aug 2023 21:11:39 +0800 Subject: [PATCH 1/3] fix(test): fix error handling condition in test --- pkg/kubelet/apis/podresources/server_v1_test.go | 2 +- staging/src/k8s.io/kubectl/pkg/cmd/events/events_test.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/kubelet/apis/podresources/server_v1_test.go b/pkg/kubelet/apis/podresources/server_v1_test.go index 4d342101d2f..41d7e72a99b 100644 --- a/pkg/kubelet/apis/podresources/server_v1_test.go +++ b/pkg/kubelet/apis/podresources/server_v1_test.go @@ -710,7 +710,7 @@ func TestGetPodResourcesV1(t *testing.T) { t.Errorf("want exit = %v, got %v", tc.err, err) } } else { - if err != err { + if err != nil { 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) } From 9a24dd2c27f8830317602c9c0910a43683be5ed7 Mon Sep 17 00:00:00 2001 From: ithrael Date: Mon, 28 Aug 2023 18:55:12 +0800 Subject: [PATCH 2/3] fix(test): fix error comparison in GetPodResourcesV1 test --- pkg/kubelet/apis/podresources/server_v1_test.go | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkg/kubelet/apis/podresources/server_v1_test.go b/pkg/kubelet/apis/podresources/server_v1_test.go index 41d7e72a99b..b05f6e125f0 100644 --- a/pkg/kubelet/apis/podresources/server_v1_test.go +++ b/pkg/kubelet/apis/podresources/server_v1_test.go @@ -710,12 +710,8 @@ func TestGetPodResourcesV1(t *testing.T) { t.Errorf("want exit = %v, got %v", tc.err, err) } } else { - if err != nil { - t.Errorf("want exit = %v, got %v", tc.err, err) - } else { - if !equalGetResponse(tc.expectedResponse, resp) { - t.Errorf("want resp = %s, got %s", tc.expectedResponse.String(), resp.String()) - } + if !equalGetResponse(tc.expectedResponse, resp) { + t.Errorf("want resp = %s, got %s", tc.expectedResponse.String(), resp.String()) } } }) From e187368242b8b4179c14a6b1144b904063992993 Mon Sep 17 00:00:00 2001 From: ithrael Date: Wed, 30 Aug 2023 10:39:58 +0800 Subject: [PATCH 3/3] fix(test): fix TestGetPodResourcesV1 comparison logic in tests --- pkg/kubelet/apis/podresources/server_v1_test.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkg/kubelet/apis/podresources/server_v1_test.go b/pkg/kubelet/apis/podresources/server_v1_test.go index b05f6e125f0..0852d7040d0 100644 --- a/pkg/kubelet/apis/podresources/server_v1_test.go +++ b/pkg/kubelet/apis/podresources/server_v1_test.go @@ -705,13 +705,18 @@ 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 !equalGetResponse(tc.expectedResponse, resp) { - t.Errorf("want resp = %s, got %s", tc.expectedResponse.String(), resp.String()) + if err != tc.err { + t.Errorf("want exit = %v, got %v", tc.err, err) + } else { + if !equalGetResponse(tc.expectedResponse, resp) { + t.Errorf("want resp = %s, got %s", tc.expectedResponse.String(), resp.String()) + } } } })