Merge pull request #26711 from yujuhong/fix_restart

Automatic merge from submit-queue e2e: fix node restart tests The test does not run in the per-PR suite, so e2e is not required.

Merge pull request #26711 from yujuhong/fix_restart
91416324 · k8s-merge-robot · cae939b8 · 8b082ce5 · 91416324
Commit 91416324 authored Jun 02, 2016 by k8s-merge-robot
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

restart.go test/e2e/restart.go +1 -1

No files found.
--- a/test/e2e/restart.go
+++ b/test/e2e/restart.go
@@ -92,7 +92,7 @@ var _ = framework.KubeDescribe("Restart [Disruptive]", func() {
 		podNamesAfter, err := waitForNPods(ps, len(podNamesBefore), framework.RestartPodReadyAgainTimeout)
 		Expect(err).NotTo(HaveOccurred())
 		remaining := framework.RestartPodReadyAgainTimeout - time.Since(podCheckStart)
-		if !framework.CheckPodsRunningReady(f.Client, ns, podNamesAfter, remaining) {
+		if !framework.CheckPodsRunningReadyOrSucceeded(f.Client, ns, podNamesAfter, remaining) {
 			framework.Failf("At least one pod wasn't running and ready after the restart.")
 		}
 	})