From 04be2c4162f5fe680fbdc47703fa6979c12ef674 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=80b=C3=A9j=C3=ADd=C3=A9=20=C3=80yod=C3=A9l=C3=A9?= Date: Thu, 9 May 2019 15:23:41 +0000 Subject: [PATCH] Clean up pkg/api. These are based on recommendation from [staticcheck](http://staticcheck.io/). --- pkg/api/service/util_test.go | 4 ++-- pkg/api/testing/copy_test.go | 2 +- pkg/api/testing/serialization_test.go | 2 +- pkg/api/v1/pod/util_test.go | 3 +-- pkg/api/v1/service/util_test.go | 4 ++-- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/pkg/api/service/util_test.go b/pkg/api/service/util_test.go index 81207046ac5..7006310e70e 100644 --- a/pkg/api/service/util_test.go +++ b/pkg/api/service/util_test.go @@ -53,13 +53,13 @@ func TestGetLoadBalancerSourceRanges(t *testing.T) { annotations[api.AnnotationLoadBalancerSourceRangesKey] = v svc := api.Service{} svc.Annotations = annotations - cidrs, err := GetLoadBalancerSourceRanges(&svc) + _, err := GetLoadBalancerSourceRanges(&svc) if err != nil { t.Errorf("Unexpected error parsing: %q", v) } svc = api.Service{} svc.Spec.LoadBalancerSourceRanges = strings.Split(v, ",") - cidrs, err = GetLoadBalancerSourceRanges(&svc) + cidrs, err := GetLoadBalancerSourceRanges(&svc) if err != nil { t.Errorf("Unexpected error parsing: %q", v) } diff --git a/pkg/api/testing/copy_test.go b/pkg/api/testing/copy_test.go index 2ed8d943215..fd032cfd06f 100644 --- a/pkg/api/testing/copy_test.go +++ b/pkg/api/testing/copy_test.go @@ -69,7 +69,7 @@ func doDeepCopyTest(t *testing.T, kind schema.GroupVersionKind, f *fuzz.Fuzzer) return } - if bytes.Compare(prefuzzData.Bytes(), postfuzzData.Bytes()) != 0 { + if !bytes.Equal(prefuzzData.Bytes(), postfuzzData.Bytes()) { t.Log(diff.StringDiff(prefuzzData.String(), postfuzzData.String())) t.Errorf("Fuzzing copy modified original of %#v", kind) return diff --git a/pkg/api/testing/serialization_test.go b/pkg/api/testing/serialization_test.go index 00b7aa309e6..c22f2b929f1 100644 --- a/pkg/api/testing/serialization_test.go +++ b/pkg/api/testing/serialization_test.go @@ -387,7 +387,7 @@ func TestObjectWatchFraming(t *testing.T) { } sr = streaming.NewDecoder(framer.NewFrameReader(ioutil.NopCloser(out)), s) outEvent := &metav1.WatchEvent{} - res, _, err = sr.Decode(nil, outEvent) + _, _, err = sr.Decode(nil, outEvent) if err != nil || outEvent.Type != string(watch.Added) { t.Fatalf("%v: %#v", err, outEvent) } diff --git a/pkg/api/v1/pod/util_test.go b/pkg/api/v1/pod/util_test.go index 3d34d5d6c0a..681d5faab55 100644 --- a/pkg/api/v1/pod/util_test.go +++ b/pkg/api/v1/pod/util_test.go @@ -604,8 +604,7 @@ func TestUpdatePodCondition(t *testing.T) { } for _, test := range tests { - var resultStatus bool - resultStatus = UpdatePodCondition(test.status, &test.conditions) + resultStatus := UpdatePodCondition(test.status, &test.conditions) assert.Equal(t, test.expected, resultStatus, test.desc) } diff --git a/pkg/api/v1/service/util_test.go b/pkg/api/v1/service/util_test.go index 04c94187b81..9813017c491 100644 --- a/pkg/api/v1/service/util_test.go +++ b/pkg/api/v1/service/util_test.go @@ -53,13 +53,13 @@ func TestGetLoadBalancerSourceRanges(t *testing.T) { annotations[v1.AnnotationLoadBalancerSourceRangesKey] = v svc := v1.Service{} svc.Annotations = annotations - cidrs, err := GetLoadBalancerSourceRanges(&svc) + _, err := GetLoadBalancerSourceRanges(&svc) if err != nil { t.Errorf("Unexpected error parsing: %q", v) } svc = v1.Service{} svc.Spec.LoadBalancerSourceRanges = strings.Split(v, ",") - cidrs, err = GetLoadBalancerSourceRanges(&svc) + cidrs, err := GetLoadBalancerSourceRanges(&svc) if err != nil { t.Errorf("Unexpected error parsing: %q", v) }