Enable back the old check for multiple deployer pods temporarily disabled in #16956

tnozicka · tnozicka · commit 62b1cbc65aac · 2017-11-29T12:22:13.000+01:00
diff --git a/test/extended/deployments/util.go b/test/extended/deployments/util.go
@@ -162,10 +162,9 @@ func checkDeploymentInvariants(dc *deployapi.DeploymentConfig, rcs []*corev1.Rep
 			running.Insert(k)
 		}
 	}
-	// FIXME: enable this check when we fix the controllers
-	//if running.Len() > 1 {
-	//	return fmt.Errorf("found multiple running deployments: %v", running.List())
-	//}
+	if running.Len() > 1 {
+		return fmt.Errorf("found multiple running deployments: %v", running.List())
+	}
 	sawStatus := sets.NewString()
 	statuses := []string{}
 	for _, rc := range rcs {

Original file line number	Diff line number	Diff line change
`@@ -162,10 +162,9 @@ func checkDeploymentInvariants(dc deployapi.DeploymentConfig, rcs []corev1.Rep`
`162`	`162`	`running.Insert(k)`
`163`	`163`	`}`
`164`	`164`	`}`
`165`		`- // FIXME: enable this check when we fix the controllers`
`166`		`- //if running.Len() > 1 {`
`167`		`- // return fmt.Errorf("found multiple running deployments: %v", running.List())`
`168`		`- //}`
	`165`	`+ if running.Len() > 1 {`
	`166`	`+ return fmt.Errorf("found multiple running deployments: %v", running.List())`
	`167`	`+ }`
`169`	`168`	`sawStatus := sets.NewString()`
`170`	`169`	`statuses := []string{}`
`171`	`170`	`for _, rc := range rcs {`