0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #39915 from thaJeztah/update_waitAndAssert_comments

Browse source 
integration-cli: update comments referencing waitAndAssert()
This commit is contained in:
Tibor Vass 2019-09-12 10:40:12 -07:00 • committed by GitHub
commit f737ea876a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
integration-cli/docker_api_swarm_test.go
View file

@ -737,7 +737,7 @@ func checkClusterHealth(c *testing.T, cl []*daemon.Daemon, managerCount, workerC
info swarm.Info
)
// check info in a waitAndAssert, because if the cluster doesn't have a leader, `info` will return an error
// check info in a poll.WaitOn(), because if the cluster doesn't have a leader, `info` will return an error
checkInfo := func(c *testing.T) (interface{}, string) {
client := d.NewClientT(c)
daemonInfo, err := client.Info(context.Background())

2
integration-cli/docker_cli_service_logs_test.go
View file

@ -51,7 +51,7 @@ func (s *DockerSwarmSuite) TestServiceLogs(c *testing.T) {
}
}
// countLogLines returns a closure that can be used with waitAndAssert to
// countLogLines returns a closure that can be used with poll.WaitOn() to
// verify that a minimum number of expected container log messages have been
// output.
func countLogLines(d *daemon.Daemon, name string) func(*testing.T) (interface{}, string) {