Merge pull request kubernetes#77670 from bjhaid/cleanup_pkg_api

Clean up pkg/api.

Author: k8s-ci-robot

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)
 		}

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

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)
 		}

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)
 	}

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)
 		}