Browse code
integration-cli: update comments referencing waitAndAssert()
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Sebastiaan van Stijn authored on 2019/09/12 15:27:03Showing 2 changed files
| ... | ... |
@@ -737,7 +737,7 @@ func checkClusterHealth(c *testing.T, cl []*daemon.Daemon, managerCount, workerC |
| 737 | 737 |
info swarm.Info |
| 738 | 738 |
) |
| 739 | 739 |
|
| 740 |
- // check info in a waitAndAssert, because if the cluster doesn't have a leader, `info` will return an error |
|
| 740 |
+ // check info in a poll.WaitOn(), because if the cluster doesn't have a leader, `info` will return an error |
|
| 741 | 741 |
checkInfo := func(c *testing.T) (interface{}, string) {
|
| 742 | 742 |
client := d.NewClientT(c) |
| 743 | 743 |
daemonInfo, err := client.Info(context.Background()) |
| ... | ... |
@@ -51,7 +51,7 @@ func (s *DockerSwarmSuite) TestServiceLogs(c *testing.T) {
|
| 51 | 51 |
} |
| 52 | 52 |
} |
| 53 | 53 |
|
| 54 |
-// countLogLines returns a closure that can be used with waitAndAssert to |
|
| 54 |
+// countLogLines returns a closure that can be used with poll.WaitOn() to |
|
| 55 | 55 |
// verify that a minimum number of expected container log messages have been |
| 56 | 56 |
// output. |
| 57 | 57 |
func countLogLines(d *daemon.Daemon, name string) func(*testing.T) (interface{}, string) {
|