github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[e2epod] wait: Don't override non-timeout errors

Browse Source
This commit is contained in:
Tim Allclair
2022-07-29 14:56:19 -07:00
parent 55ec0f2d9d
commit b289c23394
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
test/e2e/framework/pod/wait.go
View File

@@ -276,15 +276,16 @@ func WaitForPodCondition(c clientset.Interface, ns, podName, conditionDesc strin
if err == nil {
return nil
}
if IsTimeout(err) && lastPod != nil {
if IsTimeout(err) {
if lastPod != nil {
return TimeoutError(fmt.Sprintf("timed out while waiting for pod %s to be %s", podIdentifier(ns, podName), conditionDesc),
lastPod,
)
}
if lastPodError != nil {
// If the last API call was an error.
} else if lastPodError != nil {
// If the last API call was an error, propagate that instead of the timeout error.
err = lastPodError
}
}
return maybeTimeoutError(err, "waiting for pod %s to be %s", podIdentifier(ns, podName), conditionDesc)
}