Skip to content

Commit

Permalink
Bring back deployment e2e commented out due to journald limitting pro…
Browse files Browse the repository at this point in the history
…blem
  • Loading branch information
soltysh committed Dec 5, 2017
1 parent 3906907 commit e13aa42
Showing 1 changed file with 3 additions and 12 deletions.
15 changes: 3 additions & 12 deletions test/extended/deployments/deployments.go
Original file line number Diff line number Diff line change
Expand Up @@ -301,10 +301,7 @@ var _ = g.Describe("[Feature:DeploymentConfig] deploymentconfigs", func() {
g.By(fmt.Sprintf("checking the logs for substrings\n%s", out))
o.Expect(out).To(o.ContainSubstring("deployment-test-1 to 2"))
o.Expect(out).To(o.ContainSubstring("--> pre: Success"))
// FIXME: In some cases the last log messages is lost because of the journald rate
// limiter bug. For this test it should be enough to verify the deployment is marked
// as complete. We should uncomment this once the rate-limiter issues are fixed.
// o.Expect(out).To(o.ContainSubstring("--> Success"))
o.Expect(out).To(o.ContainSubstring("--> Success"))

g.By("verifying the deployment is marked complete and scaled to zero")
o.Expect(waitForLatestCondition(oc, "deployment-test", deploymentRunTimeout, deploymentReachedCompletion)).NotTo(o.HaveOccurred())
Expand Down Expand Up @@ -354,10 +351,7 @@ var _ = g.Describe("[Feature:DeploymentConfig] deploymentconfigs", func() {
o.Expect(out).To(o.ContainSubstring(fmt.Sprintf("deployment-test-%d up to 1", i+2)))
o.Expect(out).To(o.ContainSubstring("--> pre: Success"))
o.Expect(out).To(o.ContainSubstring("test pre hook executed"))
// FIXME: In some cases the last log messages is lost because of the journald rate
// limiter bug. For this test it should be enough to verify the deployment is marked
// as complete. We should uncomment this once the rate-limiter issues are fixed.
// o.Expect(out).To(o.ContainSubstring("--> Success"))
o.Expect(out).To(o.ContainSubstring("--> Success"))
}
})
})
Expand Down Expand Up @@ -556,10 +550,7 @@ var _ = g.Describe("[Feature:DeploymentConfig] deploymentconfigs", func() {
o.Expect(out).To(o.ContainSubstring("--> Reached 50%"))
o.Expect(out).To(o.ContainSubstring("Halfway"))
o.Expect(out).To(o.ContainSubstring("Finished"))
// FIXME: In some cases the last log messages is lost because of the journald rate
// limiter bug. For this test it should be enough to verify the deployment is marked
// as complete. We should uncomment this once the rate-limiter issues are fixed.
// o.Expect(out).To(o.ContainSubstring("--> Success"))
o.Expect(out).To(o.ContainSubstring("--> Success"))
})
})

Expand Down

0 comments on commit e13aa42

Please sign in to comment.