e2e: don't require minimum availability once scaling takes place

This commit is contained in:
Michail Kargakis 2016-10-13 18:14:45 +02:00
parent 5496d22733
commit cc2550c4e1

View File

@ -1166,8 +1166,6 @@ func testScaledRolloutDeployment(f *framework.Framework) {
By(fmt.Sprintf("Waiting for deployment status to sync (current available: %d, minimum available: %d)", deployment.Status.AvailableReplicas, deploymentutil.MinAvailable(deployment)))
err = framework.WaitForDeploymentStatusValid(c, deployment)
Expect(err).NotTo(HaveOccurred())
err = framework.WaitForDeploymentStatus(c, deployment)
Expect(err).NotTo(HaveOccurred())
// Update the deployment with a non-existent image so that the new replica set will be blocked.
By(fmt.Sprintf("Updating deployment %q with a non-existent image", deploymentName))
@ -1227,8 +1225,6 @@ func testScaledRolloutDeployment(f *framework.Framework) {
By(fmt.Sprintf("Waiting for deployment status to sync (current available: %d, minimum available: %d)", deployment.Status.AvailableReplicas, deploymentutil.MinAvailable(deployment)))
err = framework.WaitForDeploymentStatusValid(c, deployment)
Expect(err).NotTo(HaveOccurred())
err = framework.WaitForDeploymentStatus(c, deployment)
Expect(err).NotTo(HaveOccurred())
}
func testOverlappingDeployment(f *framework.Framework) {