diff --git a/integration-cli/docker_cli_logs_test.go b/integration-cli/docker_cli_logs_test.go index feb129c0905fd..a7bf7be4b376a 100644 --- a/integration-cli/docker_cli_logs_test.go +++ b/integration-cli/docker_cli_logs_test.go @@ -302,7 +302,7 @@ func (s *DockerCLILogsSuite) TestLogsFollowGoroutinesWithStdout(c *testing.T) { assert.NilError(c, d.WaitRun(id)) client := d.NewClientT(c) - nroutines := waitForStableGourtineCount(ctx, c, client) + nroutines := waitForStableGoroutineCount(ctx, c, client) cmd := d.Command("logs", "-f", id) r, w := io.Pipe() @@ -358,7 +358,7 @@ func (s *DockerCLILogsSuite) TestLogsFollowGoroutinesNoOutput(c *testing.T) { assert.NilError(c, d.WaitRun(id)) client := d.NewClientT(c) - nroutines := waitForStableGourtineCount(ctx, c, client) + nroutines := waitForStableGoroutineCount(ctx, c, client) assert.NilError(c, err) cmd := d.Command("logs", "-f", id) diff --git a/integration-cli/docker_cli_run_test.go b/integration-cli/docker_cli_run_test.go index 940c0bdbeeb9d..d11cd5b3f7903 100644 --- a/integration-cli/docker_cli_run_test.go +++ b/integration-cli/docker_cli_run_test.go @@ -3823,7 +3823,7 @@ func (s *DockerCLIRunSuite) TestRunAttachFailedNoLeak(c *testing.T) { client := d.NewClientT(c) - nroutines := waitForStableGourtineCount(ctx, c, client) + nroutines := waitForStableGoroutineCount(ctx, c, client) out, err := d.Cmd(append([]string{"run", "-d", "--name=test", "-p", "8000:8000", "busybox"}, sleepCommandForDaemonPlatform()...)...) assert.NilError(c, err, out) diff --git a/integration-cli/docker_utils_test.go b/integration-cli/docker_utils_test.go index 490188c5ae0ac..a0ee96dcc1678 100644 --- a/integration-cli/docker_utils_test.go +++ b/integration-cli/docker_utils_test.go @@ -347,9 +347,9 @@ func getGoroutineNumber(ctx context.Context, apiClient client.APIClient) (int, e return info.NGoroutines, nil } -func waitForStableGourtineCount(ctx context.Context, t poll.TestingT, apiClient client.APIClient) int { +func waitForStableGoroutineCount(ctx context.Context, t poll.TestingT, apiClient client.APIClient) int { var out int - poll.WaitOn(t, stableGoroutineCount(ctx, apiClient, &out), poll.WithTimeout(30*time.Second)) + poll.WaitOn(t, stableGoroutineCount(ctx, apiClient, &out), poll.WithDelay(time.Second), poll.WithTimeout(30*time.Second)) return out } @@ -374,7 +374,7 @@ func stableGoroutineCount(ctx context.Context, apiClient client.APIClient, count nRoutines = n } - if numStable > 3 { + if numStable > 6 { *count = n return poll.Success() }