From 82b9cf18904f6dcf2e69ed4b36d8c90f222b136a Mon Sep 17 00:00:00 2001
From: hwdef <hwdef97@gmail.com>
Date: Sat, 2 Nov 2019 19:53:04 +0800
Subject: [PATCH] pkg/client: fix staticcheck warning

---
 hack/.staticcheck_failures          | 1 -
 pkg/client/tests/listwatch_test.go  | 9 ++++-----
 pkg/client/tests/portfoward_test.go | 2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/hack/.staticcheck_failures b/hack/.staticcheck_failures
index 8a5700b814f..a96b81c89fe 100644
--- a/hack/.staticcheck_failures
+++ b/hack/.staticcheck_failures
@@ -3,7 +3,6 @@ cluster/images/etcd/migrate
 cmd/kube-controller-manager/app
 cmd/kube-proxy/app
 cmd/linkcheck
-pkg/client/tests
 pkg/controller/daemon
 pkg/controller/deployment
 pkg/controller/disruption
diff --git a/pkg/client/tests/listwatch_test.go b/pkg/client/tests/listwatch_test.go
index e1b1ba39f97..10d878199ff 100644
--- a/pkg/client/tests/listwatch_test.go
+++ b/pkg/client/tests/listwatch_test.go
@@ -48,13 +48,12 @@ func parseSelectorOrDie(s string) fields.Selector {
 // buildQueryValues is a convenience function for knowing if a namespace should be in a query param or not
 func buildQueryValues(query url.Values) url.Values {
 	v := url.Values{}
-	if query != nil {
-		for key, values := range query {
-			for _, value := range values {
-				v.Add(key, value)
-			}
+	for key, values := range query {
+		for _, value := range values {
+			v.Add(key, value)
 		}
 	}
+
 	return v
 }
 
diff --git a/pkg/client/tests/portfoward_test.go b/pkg/client/tests/portfoward_test.go
index d6122606deb..b77cea11a0d 100644
--- a/pkg/client/tests/portfoward_test.go
+++ b/pkg/client/tests/portfoward_test.go
@@ -173,7 +173,7 @@ func TestForwardPorts(t *testing.T) {
 				continue
 			}
 			b := make([]byte, 4)
-			n, err = clientConn.Read(b)
+			_, err = clientConn.Read(b)
 			if err != nil && err != io.EOF {
 				t.Errorf("%s: Error reading data: %s", testName, err)
 				server.Close()