Merge pull request kubernetes#86781 from SataQiu/staticcheck-20200102

Fix staticcheck failures of test/integration/client test/integration/disruption

Author: k8s-ci-robot

hack/.staticcheck_failures

@@ -59,9 +59,7 @@ test/e2e/autoscaling
 test/e2e/instrumentation/logging/stackdriver
 test/e2e/instrumentation/monitoring
 test/integration/auth
-test/integration/client
 test/integration/deployment
-test/integration/disruption
 test/integration/etcd
 test/integration/examples
 test/integration/framework

test/integration/client/client_test.go

@@ -179,7 +179,7 @@ func TestAtomicPut(t *testing.T) {
 					tmpRC.Spec.Selector[l] = v
 					tmpRC.Spec.Template.Labels[l] = v
 				}
-				tmpRC, err = rcs.Update(tmpRC)
+				_, err = rcs.Update(tmpRC)
 				if err != nil {
 					if apierrors.IsConflict(err) {
 						// This is what we expect.
@@ -226,7 +226,7 @@ func TestPatch(t *testing.T) {
 		},
 	}
 	pods := c.CoreV1().Pods("default")
-	pod, err := pods.Create(&podBody)
+	_, err := pods.Create(&podBody)
 	if err != nil {
 		t.Fatalf("Failed creating patchpods: %v", err)
 	}
@@ -285,7 +285,7 @@ func TestPatch(t *testing.T) {
 		if err != nil {
 			t.Fatalf("Failed updating patchpod with patch type %s: %v", k, err)
 		}
-		pod, err = pods.Get(name, metav1.GetOptions{})
+		pod, err := pods.Get(name, metav1.GetOptions{})
 		if err != nil {
 			t.Fatalf("Failed getting patchpod: %v", err)
 		}

test/integration/disruption/disruption_test.go

@@ -163,6 +163,9 @@ func TestPDBWithScaleSubresource(t *testing.T) {
 	waitPDBStable(t, clientSet, 4, nsName, pdb.Name)
 
 	newPdb, err := clientSet.PolicyV1beta1().PodDisruptionBudgets(nsName).Get(pdb.Name, metav1.GetOptions{})
+	if err != nil {
+		t.Errorf("Error getting PodDisruptionBudget: %v", err)
+	}
 
 	if expected, found := int32(replicas), newPdb.Status.ExpectedPods; expected != found {
 		t.Errorf("Expected %d, but found %d", expected, found)