Merge pull request #35128 from wongma7/wait-restartpolicy

Automatic merge from submit-queue Set done to true & return error if RestartPolicy not Always in test framework Found a small issue with https://github.com/kubernetes/kubernetes/pull/34632, it returns an error if the RestartPolicy is not Always, but the user will never see it because done isn't set to true & they will timeout instead. @Random-Liu because you wrote that PR

Merge pull request #35128 from wongma7/wait-restartpolicy
e190fec5 · Kubernetes Submit Queue · GitHub · 1b62e4c0 · 28f1d48b · e190fec5
Commit e190fec5 authored Oct 27, 2016 by Kubernetes Submit Queue Committed by GitHub Oct 27, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

util.go test/e2e/framework/util.go +1 -1

No files found.
--- a/test/e2e/framework/util.go
+++ b/test/e2e/framework/util.go
@@ -1314,7 +1314,7 @@ func waitForPodTerminatedInNamespace(c clientset.Interface, podName, reason, nam
 func waitForPodSuccessInNamespaceTimeout(c clientset.Interface, podName string, namespace string, timeout time.Duration) error {
 	return waitForPodCondition(c, namespace, podName, "success or failure", timeout, func(pod *api.Pod) (bool, error) {
 		if pod.Spec.RestartPolicy == api.RestartPolicyAlways {
-			return false, fmt.Errorf("pod %q will never terminate with a succeeded state since its restart policy is Always", podName)
+			return true, fmt.Errorf("pod %q will never terminate with a succeeded state since its restart policy is Always", podName)
 		}
 		switch pod.Status.Phase {
 		case api.PodSucceeded: