Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/code.cloudfoundry.org/inigo/cell/cell_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ import (
"code.cloudfoundry.org/inigo/world"
)

const cellSuiteEventuallyTestTimeout = 30 * time.Second
const cellSuiteEventuallyPollingTimeout = 1 * time.Second

var (
componentMaker world.ComponentMaker

Expand Down
2 changes: 1 addition & 1 deletion src/code.cloudfoundry.org/inigo/cell/converger_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ var _ = Describe("Convergence to desired state", func() {

It("eventually brings it up", func() {
Eventually(runningLRPsPoller).Should(HaveLen(1))
Eventually(helloWorldInstancePoller).Should(Equal([]string{"0"}))
Eventually(helloWorldInstancePoller, cellSuiteEventuallyTestTimeout, cellSuiteEventuallyPollingTimeout).Should(Equal([]string{"0"}))
})
})
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,10 @@ var _ = Describe("InstanceIdentity", func() {
JustBeforeEach(func() {
err := bbsClient.DesireLRP(lgr, "", lrp)
Expect(err).NotTo(HaveOccurred())
Eventually(helpers.LRPStatePoller(lgr, bbsClient, processGUID, nil)).Should(Equal(models.ActualLRPStateRunning))
Eventually(func() func() string {
return helpers.LRPStatePoller(lgr, bbsClient, processGUID, nil)
},
cellSuiteEventuallyTestTimeout, cellSuiteEventuallyPollingTimeout).Should(Equal(models.ActualLRPStateRunning))

address = getContainerInternalAddress(bbsClient, processGUID, 8080, true)
})
Expand Down
6 changes: 3 additions & 3 deletions src/code.cloudfoundry.org/inigo/cell/ssh_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -174,9 +174,9 @@ var _ = Describe("SSH", func() {
return lrps
}).Should(HaveLen(2))

Eventually(
helpers.LRPInstanceStatePoller(logger, bbsClient, processGuid, 0, nil),
).Should(Equal(models.ActualLRPStateRunning))
Eventually(func() func() string {
return helpers.LRPInstanceStatePoller(logger, bbsClient, processGuid, 0, nil)
}, cellSuiteEventuallyTestTimeout, cellSuiteEventuallyPollingTimeout).Should(Equal(models.ActualLRPStateRunning))

Eventually(
helpers.LRPInstanceStatePoller(logger, bbsClient, processGuid, 1, nil),
Expand Down