github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 12:15:52 +00:00
Code Issues Projects Releases Wiki Activity

Fix err variable shadowing issue in storage/utils

Browse Source 
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
This commit is contained in:
Jing Xu 2020-01-06 12:15:29 -08:00
parent 1c033105eb
commit 51d5303662
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
test/e2e/storage/utils/utils.go
View File

@ -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",