github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #86886 from jingxu97/Jan/utilsNil

Browse Source 
Fix err variable shadowing issue in storage/utils
This commit is contained in:
Kubernetes Prow Robot 2020-01-15 01:21:46 -08:00 committed by GitHub
commit e053c4733d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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) { func VerifyExecInPodSucceed(f *framework.Framework, pod *v1.Pod, shExec string) {
_, err := PodExec(f, pod, shExec) _, err := PodExec(f, pod, shExec)
if err != nil { if err != nil {
if err, ok := err.(uexec.CodeExitError); ok { if exiterr, ok := err.(uexec.CodeExitError); ok {
exitCode := err.ExitStatus() exitCode := exiterr.ExitStatus()
framework.ExpectNoError(err, framework.ExpectNoError(err,
"%q should succeed, but failed with exit code %d and error message %q", "%q should succeed, but failed with exit code %d and error message %q",
shExec, exitCode, err) shExec, exitCode, exiterr)
} else { } else {
framework.ExpectNoError(err, framework.ExpectNoError(err,
"%q should succeed, but failed with error message %q", "%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) { func VerifyExecInPodFail(f *framework.Framework, pod *v1.Pod, shExec string, exitCode int) {
_, err := PodExec(f, pod, shExec) _, err := PodExec(f, pod, shExec)
if err != nil { if err != nil {
if err, ok := err.(clientexec.ExitError); ok { if exiterr, ok := err.(clientexec.ExitError); ok {
actualExitCode := err.ExitStatus() actualExitCode := exiterr.ExitStatus()
framework.ExpectEqual(actualExitCode, exitCode, framework.ExpectEqual(actualExitCode, exitCode,
"%q should fail with exit code %d, but failed with exit code %d and error message %q", "%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 { } else {
framework.ExpectNoError(err, framework.ExpectNoError(err,
"%q should fail with exit code %d, but failed with error message %q", "%q should fail with exit code %d, but failed with error message %q",