From a44d90cdd456880a02e08346ac43bbbb4a3e6359 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 12 Sep 2019 08:27:03 +0200 Subject: [PATCH] integration-cli: update comments referencing waitAndAssert() Signed-off-by: Sebastiaan van Stijn --- integration-cli/docker_api_swarm_test.go | 2 +- integration-cli/docker_cli_service_logs_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/integration-cli/docker_api_swarm_test.go b/integration-cli/docker_api_swarm_test.go index 4b3b418f0e..b443988b36 100644 --- a/integration-cli/docker_api_swarm_test.go +++ b/integration-cli/docker_api_swarm_test.go @@ -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()) diff --git a/integration-cli/docker_cli_service_logs_test.go b/integration-cli/docker_cli_service_logs_test.go index 66842ae89d..a8eba352eb 100644 --- a/integration-cli/docker_cli_service_logs_test.go +++ b/integration-cli/docker_cli_service_logs_test.go @@ -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) {