Merge pull request #39320 from bruceauyeung/k8s-branch-fix-incorrect-parameter-passing

Automatic merge from submit-queue fix incorrect parameter passing Signed-off-by: bruceauyeung <ouyang.qinhua@zte.com.cn> **What this PR does / why we need it**: 1. fix incorrect parameter passing when creating error 2. fix ineffectual assignment to err variable.

Merge pull request #39320 from bruceauyeung/k8s-branch-fix-incorrect-parameter-passing
3ac0581a · Kubernetes Submit Queue · GitHub · 5fc6e2d7 · 21e49646 · 3ac0581a
Commit 3ac0581a authored Jan 27, 2017 by Kubernetes Submit Queue Committed by GitHub Jan 27, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

kubeconfig_test.go cmd/kubeadm/app/phases/kubeconfig/kubeconfig_test.go +1 -1

No files found.
--- a/cmd/kubeadm/app/phases/kubeconfig/kubeconfig_test.go
+++ b/cmd/kubeadm/app/phases/kubeconfig/kubeconfig_test.go
@@ -177,7 +177,7 @@ func TestWriteKubeconfigToDisk(t *testing.T) {
 				err,
 			)
 		}
-		newFile, err := ioutil.ReadFile(configPath)
+		newFile, _ := ioutil.ReadFile(configPath)
 		if !bytes.Equal(newFile, rt.file) {
 			t.Errorf(
 				"failed WriteKubeconfigToDisk config write:\n\texpected: %s\n\t  actual: %s",