github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 22:46:12 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #33011 from kargakis/fix-flaky-test

Browse Source 
Automatic merge from submit-queue

test: use low terminationGracePeriod for deployment test

Hopefully fixes https://github.com/kubernetes/kubernetes/issues/32692

@janetkuo PTAL
This commit is contained in:
Kubernetes Submit Queue 2016-09-21 17:22:55 -07:00 committed by GitHub
commit a44aeca42b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/e2e/deployment.go
View File

@ -605,7 +605,7 @@ func testPausedDeployment(f *framework.Framework) {
podLabels := map[string]string{"name": nginxImageName}
d := newDeployment(deploymentName, 1, podLabels, nginxImageName, nginxImage, extensions.RollingUpdateDeploymentStrategyType, nil)
d.Spec.Paused = true
tgps := int64(20)
tgps := int64(1)
d.Spec.Template.Spec.TerminationGracePeriodSeconds = &tgps
framework.Logf("Creating paused deployment %s", deploymentName)
_, err := c.Extensions().Deployments(ns).Create(d)
@ -662,7 +662,7 @@ func testPausedDeployment(f *framework.Framework) {
// Update the deployment template - the new replicaset should stay the same
framework.Logf("Updating paused deployment %q", deploymentName)
newTGPS := int64(40)
newTGPS := int64(0)
deployment, err = framework.UpdateDeploymentWithRetries(c, ns, d.Name, func(update *extensions.Deployment) {
update.Spec.Template.Spec.TerminationGracePeriodSeconds = &newTGPS
})