Skip to content

Commit

Permalink
Merge pull request #16258 from tnozicka/fix-flake-16235
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue (batch tested with PRs 16258, 16214)

Fix deployment minReadySecond check for availableReplicas after all pods are ready

Fixes #16235
  • Loading branch information
openshift-merge-robot authored Sep 9, 2017
2 parents f6d4a1b + f288fb2 commit 9bbec3f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion test/extended/deployments/deployments.go
Original file line number Diff line number Diff line change
Expand Up @@ -927,7 +927,7 @@ var _ = g.Describe("deploymentconfigs", func() {
return rc.Status.ReadyReplicas == dc.Spec.Replicas, nil
})
o.Expect(err).NotTo(o.HaveOccurred())
o.Expect(rc1.Status.AvailableReplicas).To(o.BeZero())
o.Expect(rc1.Status.AvailableReplicas).To(o.BeNumerically("<", rc1.Status.ReadyReplicas))
// We need to log here to have a timestamp to compare with master logs if something goes wrong
e2e.Logf("All replicas are ready.")

Expand Down

0 comments on commit 9bbec3f

Please sign in to comment.