upstream/kubernetes
1
0
Fork 0
mirror of https://github.com/kubernetes/kubernetes.git synced 2026-06-11 01:41:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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
This commit is contained in:
k8s-merge-robot 2016-07-04 11:06:43 -07:00 committed by GitHub
commit cd7a56ba46
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
test/e2e/deployment.go
View file

@ -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