Fix race in extended deployments test "should deal with cancellation after deployer pod succeeded"

tnozicka · tnozicka · commit 84cdf4083f82 · 2017-12-19T21:38:35.000+01:00
diff --git a/test/extended/deployments/deployments.go b/test/extended/deployments/deployments.go
@@ -1359,7 +1359,7 @@ var _ = g.Describe("[Feature:DeploymentConfig] deploymentconfigs", func() {
 
 			// Wait for deployment pod to be running
 			_, err = waitForRCModification(oc, namespace, appsutil.LatestDeploymentNameForConfig(dc), deploymentRunTimeout,
-				"", func(currentRC *kapiv1.ReplicationController) (bool, error) {
+				rc.ResourceVersion, func(currentRC *kapiv1.ReplicationController) (bool, error) {
 					if appsutil.DeploymentStatusFor(currentRC) == appsapi.DeploymentStatusRunning {
 						return true, nil
 					}

Original file line number	Diff line number	Diff line change
`@@ -1359,7 +1359,7 @@ var _ = g.Describe("[Feature:DeploymentConfig] deploymentconfigs", func() {`
`1359`	`1359`
`1360`	`1360`	`// Wait for deployment pod to be running`
`1361`	`1361`	`_, err = waitForRCModification(oc, namespace, appsutil.LatestDeploymentNameForConfig(dc), deploymentRunTimeout,`
`1362`		`- "", func(currentRC *kapiv1.ReplicationController) (bool, error) {`
	`1362`	`+ rc.ResourceVersion, func(currentRC *kapiv1.ReplicationController) (bool, error) {`
`1363`	`1363`	`if appsutil.DeploymentStatusFor(currentRC) == appsapi.DeploymentStatusRunning {`
`1364`	`1364`	`return true, nil`
`1365`	`1365`	`}`