From 51d53036621b7da7af5cb69f32ad4684ecbe03d9 Mon Sep 17 00:00:00 2001 From: Jing Xu Date: Mon, 6 Jan 2020 12:15:29 -0800 Subject: [PATCH] Fix err variable shadowing issue in storage/utils Issue: https://github.com/kubernetes/kubernetes/issues/86884 This PR fixes the issue that err variable gets shadowed. Because of this, it might get nil pointer error. Change-Id: Ib7da918418a7c8148a6ca598db12b3744eb3b7c8 --- test/e2e/storage/utils/utils.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/e2e/storage/utils/utils.go b/test/e2e/storage/utils/utils.go index 7b7c69e5ba5..086d01c9091 100644 --- a/test/e2e/storage/utils/utils.go +++ b/test/e2e/storage/utils/utils.go @@ -73,11 +73,11 @@ func PodExec(f *framework.Framework, pod *v1.Pod, shExec string) (string, error) func VerifyExecInPodSucceed(f *framework.Framework, pod *v1.Pod, shExec string) { _, err := PodExec(f, pod, shExec) if err != nil { - if err, ok := err.(uexec.CodeExitError); ok { - exitCode := err.ExitStatus() + if exiterr, ok := err.(uexec.CodeExitError); ok { + exitCode := exiterr.ExitStatus() framework.ExpectNoError(err, "%q should succeed, but failed with exit code %d and error message %q", - shExec, exitCode, err) + shExec, exitCode, exiterr) } else { framework.ExpectNoError(err, "%q should succeed, but failed with error message %q", @@ -90,11 +90,11 @@ func VerifyExecInPodSucceed(f *framework.Framework, pod *v1.Pod, shExec string) func VerifyExecInPodFail(f *framework.Framework, pod *v1.Pod, shExec string, exitCode int) { _, err := PodExec(f, pod, shExec) if err != nil { - if err, ok := err.(clientexec.ExitError); ok { - actualExitCode := err.ExitStatus() + if exiterr, ok := err.(clientexec.ExitError); ok { + actualExitCode := exiterr.ExitStatus() framework.ExpectEqual(actualExitCode, exitCode, "%q should fail with exit code %d, but failed with exit code %d and error message %q", - shExec, exitCode, actualExitCode, err) + shExec, exitCode, actualExitCode, exiterr) } else { framework.ExpectNoError(err, "%q should fail with exit code %d, but failed with error message %q",