Skip to content

Fix eventually calls to compare with string #1048

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 16, 2025
Merged

Fix eventually calls to compare with string #1048

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/code.cloudfoundry.org/inigo/cell/cell_suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import (
)

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

var (
componentMaker world.ComponentMaker
Expand Down
2 changes: 1 addition & 1 deletion src/code.cloudfoundry.org/inigo/cell/converger_test.go
View file
Open in desktop
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, cellSuiteEventuallyTestTimeout, cellSuiteEventuallyPollingTimeout).Should(Equal([]string{"0"}))
Eventually(helloWorldInstancePoller, cellSuiteEventuallyTestTimeout, cellSuiteEventuallyPollingInterval).Should(Equal([]string{"0"}))
})
})
})
Expand Down
9 changes: 5 additions & 4 deletions src/code.cloudfoundry.org/inigo/cell/instance_identity_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,10 +429,11 @@ var _ = Describe("InstanceIdentity", func() {
JustBeforeEach(func() {
err := bbsClient.DesireLRP(lgr, "", lrp)
Expect(err).NotTo(HaveOccurred())
Eventually(func() func() string {
return helpers.LRPStatePoller(lgr, bbsClient, processGUID, nil)
},
cellSuiteEventuallyTestTimeout, cellSuiteEventuallyPollingTimeout).Should(Equal(models.ActualLRPStateRunning))
Eventually(
helpers.LRPStatePoller(lgr, bbsClient, processGUID, nil),
cellSuiteEventuallyTestTimeout,
cellSuiteEventuallyPollingInterval,
).Should(Equal(models.ActualLRPStateRunning))

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

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

Eventually(
helpers.LRPInstanceStatePoller(logger, bbsClient, processGuid, 1, nil),
cellSuiteEventuallyTestTimeout,
cellSuiteEventuallyPollingInterval,
).Should(Equal(models.ActualLRPStateRunning))
})

Expand Down