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

Merge pull request #40971 from kargakis/lack-of-progress-fix

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 40971, 41027, 40709, 40903, 39369)

test: bump deployment condition timeout

@fejta @spxtr ptal

Fixes https://github.com/kubernetes/kubernetes/issues/39785
This commit is contained in:
Kubernetes Submit Queue
2017-02-06 20:57:12 -08:00
committed by GitHub
parent 821e171247 e8f1d9bac6
commit 4db40cbd94
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/e2e/framework/util.go
View File

@@ -3447,7 +3447,7 @@ func WaitForObservedDeployment(c clientset.Interface, ns, deploymentName string,
func WaitForDeploymentWithCondition(c clientset.Interface, ns, deploymentName, reason string, condType extensions.DeploymentConditionType) error {
var conditions []extensions.DeploymentCondition
pollErr := wait.PollImmediate(time.Second, 1*time.Minute, func() (bool, error) {
pollErr := wait.PollImmediate(time.Second, 5*time.Minute, func() (bool, error) {
deployment, err := c.Extensions().Deployments(ns).Get(deploymentName, metav1.GetOptions{})
if err != nil {
return false, err