Merge pull request #28287 from kargakis/bump-timeout-for-deleting-deployments

Automatic merge from submit-queue e2e: increase timeout when waiting for deployment pods to be deleted Use the same timeout as the one used for waiting for the deployment reaper to complete. Takes a stab at https://github.com/kubernetes/kubernetes/issues/28067 @kubernetes/deployment PTAL

Merge pull request #28287 from kargakis/bump-timeout-for-deleting-deployments
cd7a56ba · k8s-merge-robot · GitHub · 11211a49 · 8f550c1a · cd7a56ba
Commit cd7a56ba authored Jul 04, 2016 by k8s-merge-robot Committed by GitHub Jul 04, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

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

No files found.
--- a/test/e2e/deployment.go
+++ b/test/e2e/deployment.go
@@ -198,7 +198,7 @@ func stopDeployment(c *clientset.Clientset, oldC client.Interface, ns, deploymen
 	Expect(rss.Items).Should(HaveLen(0))
 	framework.Logf("Ensuring deployment %s's Pods were deleted", deploymentName)
 	var pods *api.PodList
-	if err := wait.PollImmediate(time.Second, wait.ForeverTestTimeout, func() (bool, error) {
+	if err := wait.PollImmediate(time.Second, timeout, func() (bool, error) {
 		pods, err = c.Core().Pods(ns).List(api.ListOptions{})
 		if err != nil {
 			return false, err