github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-11 04:52:08 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #120195 from Ithrael/fix/error-handling-condition-in-test

Browse Source 
fix(test): fix error handling condition in test
This commit is contained in:
Kubernetes Prow Robot 2023-10-17 20:08:01 +02:00 committed by GitHub
commit 0095ae3b25
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/kubelet/apis/podresources/server_v1_test.go
View File

@ -705,12 +705,13 @@ func TestGetPodResourcesV1(t *testing.T) {
server := NewV1PodResourcesServer(providers) server := NewV1PodResourcesServer(providers)
podReq := &podresourcesapi.GetPodResourcesRequest{PodName: podName, PodNamespace: podNamespace} podReq := &podresourcesapi.GetPodResourcesRequest{PodName: podName, PodNamespace: podNamespace}
resp, err := server.Get(context.TODO(), podReq) resp, err := server.Get(context.TODO(), podReq)
if err != nil { if err != nil {
if err.Error() != tc.err.Error() { if err.Error() != tc.err.Error() {
t.Errorf("want exit = %v, got %v", tc.err, err) t.Errorf("want exit = %v, got %v", tc.err, err)
} }
} else { } else {
if err != err { if err != tc.err {
t.Errorf("want exit = %v, got %v", tc.err, err) t.Errorf("want exit = %v, got %v", tc.err, err)
} else { } else {
if !equalGetResponse(tc.expectedResponse, resp) { if !equalGetResponse(tc.expectedResponse, resp) {

6
staging/src/k8s.io/kubectl/pkg/cmd/events/events_test.go
View File

@ -110,7 +110,7 @@ func TestEventIsSorted(t *testing.T) {
codec := scheme.Codecs.LegacyCodec(scheme.Scheme.PrioritizedVersionsAllGroups()...) codec := scheme.Codecs.LegacyCodec(scheme.Scheme.PrioritizedVersionsAllGroups()...)
streams, _, buf, _ := genericiooptions.NewTestIOStreams() streams, _, buf, _ := genericiooptions.NewTestIOStreams()
clientset, err := kubernetes.NewForConfig(cmdtesting.DefaultClientConfig()) clientset, err := kubernetes.NewForConfig(cmdtesting.DefaultClientConfig())
if err != err { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -148,7 +148,7 @@ func TestEventNoHeaders(t *testing.T) {
codec := scheme.Codecs.LegacyCodec(scheme.Scheme.PrioritizedVersionsAllGroups()...) codec := scheme.Codecs.LegacyCodec(scheme.Scheme.PrioritizedVersionsAllGroups()...)
streams, _, buf, _ := genericiooptions.NewTestIOStreams() streams, _, buf, _ := genericiooptions.NewTestIOStreams()
clientset, err := kubernetes.NewForConfig(cmdtesting.DefaultClientConfig()) clientset, err := kubernetes.NewForConfig(cmdtesting.DefaultClientConfig())
if err != err { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -185,7 +185,7 @@ func TestEventFiltered(t *testing.T) {
codec := scheme.Codecs.LegacyCodec(scheme.Scheme.PrioritizedVersionsAllGroups()...) codec := scheme.Codecs.LegacyCodec(scheme.Scheme.PrioritizedVersionsAllGroups()...)
streams, _, buf, _ := genericiooptions.NewTestIOStreams() streams, _, buf, _ := genericiooptions.NewTestIOStreams()
clientset, err := kubernetes.NewForConfig(cmdtesting.DefaultClientConfig()) clientset, err := kubernetes.NewForConfig(cmdtesting.DefaultClientConfig())
if err != err { if err != nil {
t.Fatal(err) t.Fatal(err)
} }