1. docker
  2. Commit b8db6d143a1c5e75cba5f8d7c7cebfca259d1911
Browse code

Merge pull request #48956 from thaJeztah/poll_default_delay

integration: remove default poll delay and timeouts

Sebastiaan van Stijn authored on 2024/11/28 06:20:36
Showing 21 changed files
integration/capabilities/capabilities_linux_test.go
History View file @ b8db6d1
... ... 
@@ -5,7 +5,6 @@ import (
5 5 
 	"io"
6 6 
 	"strings"
7 7 
 	"testing"
8 
-	"time"
9 8
10 9 
 	"github.com/docker/docker/api/types"
11 10 
 	containertypes "github.com/docker/docker/api/types/container"
... ... 
@@ -80,7 +79,7 @@ func TestNoNewPrivileges(t *testing.T) {
80 80 
 				container.WithSecurityOpt("no-new-privileges=true"),
81 81 
 			)
82 82 
 			cid := container.Run(ctx, t, client, opts...)
83 
-			poll.WaitOn(t, container.IsInState(ctx, client, cid, "exited"), poll.WithDelay(100*time.Millisecond))
83 
+			poll.WaitOn(t, container.IsInState(ctx, client, cid, "exited"))
84 84
85 85 
 			// Assert on outputs
86 86 
 			logReader, err := client.ContainerLogs(ctx, cid, containertypes.LogsOptions{
integration/container/checkpoint_test.go
History View file @ b8db6d1
... ... 
@@ -6,7 +6,6 @@ import (
6 6 
 	"regexp"
7 7 
 	"sort"
8 8 
 	"testing"
9 
-	"time"
10 9
11 10 
 	"github.com/docker/docker/api/types/checkpoint"
12 11 
 	containertypes "github.com/docker/docker/api/types/container"
... ... 
@@ -105,10 +104,7 @@ func TestCheckpoint(t *testing.T) {
105 105 
 	})
106 106 
 	assert.NilError(t, err)
107 107
108 
-	poll.WaitOn(t,
109 
-		container.IsInState(ctx, apiClient, cID, "exited"),
110 
-		poll.WithDelay(100*time.Millisecond),
111 
-	)
108 
+	poll.WaitOn(t, container.IsInState(ctx, apiClient, cID, "exited"))
112 109
113 110 
 	inspect, err = apiClient.ContainerInspect(ctx, cID)
114 111 
 	assert.NilError(t, err)
integration/container/create_test.go
History View file @ b8db6d1
... ... 
@@ -256,7 +256,7 @@ func TestCreateWithCustomMaskedPaths(t *testing.T) {
256 256 
 		err = apiClient.ContainerStart(ctx, c.ID, container.StartOptions{})
257 257 
 		assert.NilError(t, err)
258 258
259 
-		poll.WaitOn(t, ctr.IsInState(ctx, apiClient, c.ID, "exited"), poll.WithDelay(100*time.Millisecond))
259 
+		poll.WaitOn(t, ctr.IsInState(ctx, apiClient, c.ID, "exited"))
260 260
261 261 
 		checkInspect(t, ctx, name, tc.expected)
262 262 
 	}
... ... 
@@ -334,7 +334,7 @@ func TestCreateWithCustomReadonlyPaths(t *testing.T) {
334 334 
 		err = apiClient.ContainerStart(ctx, c.ID, container.StartOptions{})
335 335 
 		assert.NilError(t, err)
336 336
337 
-		poll.WaitOn(t, ctr.IsInState(ctx, apiClient, c.ID, "exited"), poll.WithDelay(100*time.Millisecond))
337 
+		poll.WaitOn(t, ctr.IsInState(ctx, apiClient, c.ID, "exited"))
338 338
339 339 
 		checkInspect(t, ctx, name, tc.expected)
340 340 
 	}
integration/container/diff_test.go
History View file @ b8db6d1
... ... 
@@ -38,7 +38,7 @@ func TestDiffStoppedContainer(t *testing.T) {
38 38
39 39 
 	cID := container.Run(ctx, t, apiClient, container.WithCmd("sh", "-c", `mkdir /foo; echo xyzzy > /foo/bar`))
40 40
41 
-	poll.WaitOn(t, container.IsInState(ctx, apiClient, cID, "exited"), poll.WithDelay(100*time.Millisecond), poll.WithTimeout(60*time.Second))
41 
+	poll.WaitOn(t, container.IsInState(ctx, apiClient, cID, "exited"), poll.WithTimeout(60*time.Second))
42 42
43 43 
 	expected := []containertypes.FilesystemChange{
44 44 
 		{Kind: containertypes.ChangeAdd, Path: "/foo"},
integration/container/export_test.go
History View file @ b8db6d1
... ... 
@@ -4,7 +4,6 @@ import (
4 4 
 	"encoding/json"
5 5 
 	"strings"
6 6 
 	"testing"
7 
-	"time"
8 7
9 8 
 	"github.com/docker/docker/api/types/filters"
10 9 
 	"github.com/docker/docker/api/types/image"
... ... 
@@ -26,7 +25,7 @@ func TestExportContainerAndImportImage(t *testing.T) {
26 26 
 	apiClient := testEnv.APIClient()
27 27
28 28 
 	cID := container.Run(ctx, t, apiClient, container.WithCmd("true"))
29 
-	poll.WaitOn(t, container.IsStopped(ctx, apiClient, cID), poll.WithDelay(100*time.Millisecond))
29 
+	poll.WaitOn(t, container.IsStopped(ctx, apiClient, cID))
30 30
31 31 
 	reference := "repo/" + strings.ToLower(t.Name()) + ":v1"
32 32 
 	exportResp, err := apiClient.ContainerExport(ctx, cID)
integration/container/health_test.go
History View file @ b8db6d1
... ... 
@@ -29,7 +29,7 @@ func TestHealthCheckWorkdir(t *testing.T) {
29 29 
 		}
30 30 
 	})
31 31
32 
-	poll.WaitOn(t, pollForHealthStatus(ctx, apiClient, cID, containertypes.Healthy), poll.WithDelay(100*time.Millisecond))
32 
+	poll.WaitOn(t, pollForHealthStatus(ctx, apiClient, cID, containertypes.Healthy))
33 33 
 }
34 34
35 35 
 // GitHub #37263
... ... 
@@ -74,21 +74,21 @@ while true; do sleep 1; done
74 74
75 75 
 	ctxPoll, cancel := context.WithTimeout(ctx, 30*time.Second)
76 76 
 	defer cancel()
77 
-	poll.WaitOn(t, pollForHealthStatus(ctxPoll, apiClient, id, "healthy"), poll.WithDelay(100*time.Millisecond))
77 
+	poll.WaitOn(t, pollForHealthStatus(ctxPoll, apiClient, id, "healthy"))
78 78
79 79 
 	err := apiClient.ContainerKill(ctx, id, "SIGUSR1")
80 80 
 	assert.NilError(t, err)
81 81
82 82 
 	ctxPoll, cancel = context.WithTimeout(ctx, 30*time.Second)
83 83 
 	defer cancel()
84 
-	poll.WaitOn(t, pollForHealthStatus(ctxPoll, apiClient, id, "unhealthy"), poll.WithDelay(100*time.Millisecond))
84 
+	poll.WaitOn(t, pollForHealthStatus(ctxPoll, apiClient, id, "unhealthy"))
85 85
86 86 
 	err = apiClient.ContainerKill(ctx, id, "SIGUSR1")
87 87 
 	assert.NilError(t, err)
88 88
89 89 
 	ctxPoll, cancel = context.WithTimeout(ctx, 30*time.Second)
90 90 
 	defer cancel()
91 
-	poll.WaitOn(t, pollForHealthStatus(ctxPoll, apiClient, id, "healthy"), poll.WithDelay(100*time.Millisecond))
91 
+	poll.WaitOn(t, pollForHealthStatus(ctxPoll, apiClient, id, "healthy"))
92 92 
 }
93 93
94 94 
 // TestHealthCheckProcessKilled verifies that health-checks exec get killed on time-out.
... ... 
@@ -142,7 +142,7 @@ func TestHealthStartInterval(t *testing.T) {
142 142 
 			return poll.Continue("waiting on container to be ready")
143 143 
 		}
144 144 
 		return poll.Success()
145 
-	}, poll.WithDelay(100*time.Millisecond), poll.WithTimeout(time.Until(dl)))
145 
+	}, poll.WithTimeout(time.Until(dl)))
146 146 
 	cancel()
147 147
148 148 
 	ctxPoll, cancel = context.WithTimeout(ctx, 2*time.Minute)
integration/container/kill_test.go
History View file @ b8db6d1
... ... 
@@ -3,7 +3,6 @@ package container // import "github.com/docker/docker/integration/container"
3 3 
 import (
4 4 
 	"runtime"
5 5 
 	"testing"
6 
-	"time"
7 6
8 7 
 	containertypes "github.com/docker/docker/api/types/container"
9 8 
 	"github.com/docker/docker/integration/internal/container"
... ... 
@@ -23,12 +22,12 @@ func TestKillContainerInvalidSignal(t *testing.T) {
23 23 
 	err := apiClient.ContainerKill(ctx, id, "0")
24 24 
 	assert.ErrorContains(t, err, "Error response from daemon:")
25 25 
 	assert.ErrorContains(t, err, "nvalid signal: 0") // match "(I|i)nvalid" case-insensitive to allow testing against older daemons.
26 
-	poll.WaitOn(t, container.IsInState(ctx, apiClient, id, "running"), poll.WithDelay(100*time.Millisecond))
26 
+	poll.WaitOn(t, container.IsInState(ctx, apiClient, id, "running"))
27 27
28 28 
 	err = apiClient.ContainerKill(ctx, id, "SIG42")
29 29 
 	assert.ErrorContains(t, err, "Error response from daemon:")
30 30 
 	assert.ErrorContains(t, err, "nvalid signal: SIG42") // match "(I|i)nvalid" case-insensitive to allow testing against older daemons.
31 
-	poll.WaitOn(t, container.IsInState(ctx, apiClient, id, "running"), poll.WithDelay(100*time.Millisecond))
31 
+	poll.WaitOn(t, container.IsInState(ctx, apiClient, id, "running"))
32 32 
 }
33 33
34 34 
 func TestKillContainer(t *testing.T) {
... ... 
@@ -143,7 +142,7 @@ func TestKillDifferentUserContainer(t *testing.T) {
143 143
144 144 
 	err := apiClient.ContainerKill(ctx, id, "SIGKILL")
145 145 
 	assert.NilError(t, err)
146 
-	poll.WaitOn(t, container.IsInState(ctx, apiClient, id, "exited"), poll.WithDelay(100*time.Millisecond))
146 
+	poll.WaitOn(t, container.IsInState(ctx, apiClient, id, "exited"))
147 147 
 }
148 148
149 149 
 func TestInspectOomKilledTrue(t *testing.T) {
... ... 
@@ -159,7 +158,7 @@ func TestInspectOomKilledTrue(t *testing.T) {
159 159 
 		c.HostConfig.Resources.Memory = 32 * 1024 * 1024
160 160 
 	})
161 161
162 
-	poll.WaitOn(t, container.IsInState(ctx, apiClient, cID, "exited"), poll.WithDelay(100*time.Millisecond))
162 
+	poll.WaitOn(t, container.IsInState(ctx, apiClient, cID, "exited"))
163 163
164 164 
 	inspect, err := apiClient.ContainerInspect(ctx, cID)
165 165 
 	assert.NilError(t, err)
... ... 
@@ -174,7 +173,7 @@ func TestInspectOomKilledFalse(t *testing.T) {
174 174
175 175 
 	cID := container.Run(ctx, t, apiClient, container.WithCmd("sh", "-c", "echo hello world"))
176 176
177 
-	poll.WaitOn(t, container.IsInState(ctx, apiClient, cID, "exited"), poll.WithDelay(100*time.Millisecond))
177 
+	poll.WaitOn(t, container.IsInState(ctx, apiClient, cID, "exited"))
178 178
179 179 
 	inspect, err := apiClient.ContainerInspect(ctx, cID)
180 180 
 	assert.NilError(t, err)
integration/container/logs_test.go
History View file @ b8db6d1
... ... 
@@ -137,9 +137,7 @@ func testLogs(t *testing.T, logDriver string) {
137 137 
 			)
138 138 
 			defer apiClient.ContainerRemove(ctx, id, containertypes.RemoveOptions{Force: true})
139 139
140 
-			poll.WaitOn(t, container.IsStopped(ctx, apiClient, id),
141 
-				poll.WithDelay(time.Millisecond*100),
142 
-				poll.WithTimeout(pollTimeout))
140 
+			poll.WaitOn(t, container.IsStopped(ctx, apiClient, id), poll.WithTimeout(pollTimeout))
143 141
144 142 
 			logs, err := apiClient.ContainerLogs(ctx, id, tc.logOps)
145 143 
 			assert.NilError(t, err)
integration/container/mounts_linux_test.go
History View file @ b8db6d1
... ... 
@@ -6,7 +6,6 @@ import (
6 6 
 	"path/filepath"
7 7 
 	"syscall"
8 8 
 	"testing"
9 
-	"time"
10 9
11 10 
 	"github.com/docker/docker/api"
12 11 
 	containertypes "github.com/docker/docker/api/types/container"
... ... 
@@ -271,7 +270,7 @@ func TestContainerBindMountNonRecursive(t *testing.T) {
271 271 
 	}
272 272
273 273 
 	for _, c := range containers {
274 
-		poll.WaitOn(t, container.IsSuccessful(ctx, apiClient, c), poll.WithDelay(100*time.Millisecond))
274 
+		poll.WaitOn(t, container.IsSuccessful(ctx, apiClient, c))
275 275 
 	}
276 276 
 }
277 277
... ... 
@@ -317,7 +316,7 @@ func TestContainerVolumesMountedAsShared(t *testing.T) {
317 317
318 318 
 	apiClient := testEnv.APIClient()
319 319 
 	containerID := container.Run(ctx, t, apiClient, container.WithPrivileged(true), container.WithMount(sharedMount), container.WithCmd(bindMountCmd...))
320 
-	poll.WaitOn(t, container.IsSuccessful(ctx, apiClient, containerID), poll.WithDelay(100*time.Millisecond))
320 
+	poll.WaitOn(t, container.IsSuccessful(ctx, apiClient, containerID))
321 321
322 322 
 	// Make sure a bind mount under a shared volume propagated to host.
323 323 
 	if mounted, _ := mountinfo.Mounted(tmpDir1Mnt); !mounted {
... ... 
@@ -634,7 +633,7 @@ func TestContainerBindMountRecursivelyReadOnly(t *testing.T) {
634 634 
 	}
635 635
636 636 
 	for _, c := range containers {
637 
-		poll.WaitOn(t, container.IsSuccessful(ctx, apiClient, c), poll.WithDelay(100*time.Millisecond))
637 
+		poll.WaitOn(t, container.IsSuccessful(ctx, apiClient, c))
638 638 
 	}
639 639 
 }
640 640
integration/container/nat_test.go
History View file @ b8db6d1
... ... 
@@ -9,7 +9,6 @@ import (
9 9 
 	"strconv"
10 10 
 	"strings"
11 11 
 	"testing"
12 
-	"time"
13 12
14 13 
 	containertypes "github.com/docker/docker/api/types/container"
15 14 
 	"github.com/docker/docker/integration/internal/container"
... ... 
@@ -99,7 +98,7 @@ func TestNetworkLoopbackNat(t *testing.T) {
99 99 
 		container.WithNetworkMode("container:"+serverContainerID),
100 100 
 	)
101 101
102 
-	poll.WaitOn(t, container.IsStopped(ctx, apiClient, cID), poll.WithDelay(100*time.Millisecond))
102 
+	poll.WaitOn(t, container.IsStopped(ctx, apiClient, cID))
103 103
104 104 
 	body, err := apiClient.ContainerLogs(ctx, cID, containertypes.LogsOptions{
105 105 
 		ShowStdout: true,
integration/container/pause_test.go
History View file @ b8db6d1
... ... 
@@ -3,7 +3,6 @@ package container // import "github.com/docker/docker/integration/container"
3 3 
 import (
4 4 
 	"io"
5 5 
 	"testing"
6 
-	"time"
7 6
8 7 
 	cerrdefs "github.com/containerd/errdefs"
9 8 
 	containertypes "github.com/docker/docker/api/types/container"
... ... 
@@ -72,7 +71,7 @@ func TestPauseStopPausedContainer(t *testing.T) {
72 72 
 	err = apiClient.ContainerStop(ctx, cID, containertypes.StopOptions{})
73 73 
 	assert.NilError(t, err)
74 74
75 
-	poll.WaitOn(t, container.IsStopped(ctx, apiClient, cID), poll.WithDelay(100*time.Millisecond))
75 
+	poll.WaitOn(t, container.IsStopped(ctx, apiClient, cID))
76 76 
 }
77 77
78 78 
 func getEventActions(t *testing.T, messages <-chan events.Message, errs <-chan error) []events.Action {
integration/container/remove_test.go
History View file @ b8db6d1
... ... 
@@ -3,7 +3,6 @@ package container // import "github.com/docker/docker/integration/container"
3 3 
 import (
4 4 
 	"os"
5 5 
 	"testing"
6 
-	"time"
7 6
8 7 
 	containertypes "github.com/docker/docker/api/types/container"
9 8 
 	"github.com/docker/docker/api/types/filters"
... ... 
@@ -37,7 +36,7 @@ func TestRemoveContainerWithRemovedVolume(t *testing.T) {
37 37 
 	defer tempDir.Remove()
38 38
39 39 
 	cID := container.Run(ctx, t, apiClient, container.WithCmd("true"), container.WithBind(tempDir.Path(), prefix+slash+"test"))
40 
-	poll.WaitOn(t, container.IsInState(ctx, apiClient, cID, "exited"), poll.WithDelay(100*time.Millisecond))
40 
+	poll.WaitOn(t, container.IsInState(ctx, apiClient, cID, "exited"))
41 41
42 42 
 	err := os.RemoveAll(tempDir.Path())
43 43 
 	assert.NilError(t, err)
... ... 
@@ -60,7 +59,7 @@ func TestRemoveContainerWithVolume(t *testing.T) {
60 60 
 	prefix, slash := getPrefixAndSlashFromDaemonPlatform()
61 61
62 62 
 	cID := container.Run(ctx, t, apiClient, container.WithCmd("true"), container.WithVolume(prefix+slash+"srv"))
63 
-	poll.WaitOn(t, container.IsInState(ctx, apiClient, cID, "exited"), poll.WithDelay(100*time.Millisecond))
63 
+	poll.WaitOn(t, container.IsInState(ctx, apiClient, cID, "exited"))
64 64
65 65 
 	insp, _, err := apiClient.ContainerInspectWithRaw(ctx, cID, true)
66 66 
 	assert.NilError(t, err)
integration/container/rename_test.go
History View file @ b8db6d1
... ... 
@@ -2,7 +2,6 @@ package container // import "github.com/docker/docker/integration/container"
2 2
3 3 
 import (
4 4 
 	"testing"
5 
-	"time"
6 5
7 6 
 	containertypes "github.com/docker/docker/api/types/container"
8 7 
 	"github.com/docker/docker/api/types/network"
... ... 
@@ -145,7 +144,7 @@ func TestRenameAnonymousContainer(t *testing.T) {
145 145 
 		}
146 146 
 		c.HostConfig.NetworkMode = containertypes.NetworkMode(networkName)
147 147 
 	}, container.WithCmd("ping", count, "1", container1Name))
148 
-	poll.WaitOn(t, container.IsInState(ctx, apiClient, cID, "exited"), poll.WithDelay(100*time.Millisecond))
148 
+	poll.WaitOn(t, container.IsInState(ctx, apiClient, cID, "exited"))
149 149
150 150 
 	inspect, err := apiClient.ContainerInspect(ctx, cID)
151 151 
 	assert.NilError(t, err)
integration/container/restart_test.go
History View file @ b8db6d1
... ... 
@@ -109,7 +109,7 @@ func TestDaemonRestartKillContainers(t *testing.T) {
109 109 
 						err = apiClient.ContainerStart(ctx, resp.ID, container.StartOptions{})
110 110 
 						assert.NilError(t, err)
111 111 
 						if tc.xHealthCheck {
112 
-							poll.WaitOn(t, pollForHealthStatus(ctx, apiClient, resp.ID, container.Healthy), poll.WithDelay(100*time.Millisecond), poll.WithTimeout(30*time.Second))
112 
+							poll.WaitOn(t, pollForHealthStatus(ctx, apiClient, resp.ID, container.Healthy), poll.WithTimeout(30*time.Second))
113 113 
 							testContainer.ExecT(ctx, t, apiClient, resp.ID, []string{"touch", "/tmp/unhealthy"}).AssertSuccess(t)
114 114 
 						}
115 115 
 					}
... ... 
@@ -123,7 +123,7 @@ func TestDaemonRestartKillContainers(t *testing.T) {
123 123 
 						expected = tc.xRunningLiveRestore
124 124 
 					}
125 125
126 
-					poll.WaitOn(t, testContainer.RunningStateFlagIs(ctx, apiClient, resp.ID, expected), poll.WithDelay(100*time.Millisecond), poll.WithTimeout(30*time.Second))
126 
+					poll.WaitOn(t, testContainer.RunningStateFlagIs(ctx, apiClient, resp.ID, expected), poll.WithTimeout(30*time.Second))
127 127
128 128 
 					if tc.xHealthCheck {
129 129 
 						// We have arranged to have the container's health probes fail until we tell it
... ... 
@@ -131,10 +131,10 @@ func TestDaemonRestartKillContainers(t *testing.T) {
131 131 
 						// the container's health state is Starting before we have to worry about racing
132 132 
 						// the health monitor.
133 133 
 						assert.Equal(t, testContainer.Inspect(ctx, t, apiClient, resp.ID).State.Health.Status, container.Starting)
134 
-						poll.WaitOn(t, pollForNewHealthCheck(ctx, apiClient, startTime, resp.ID), poll.WithDelay(100*time.Millisecond), poll.WithTimeout(30*time.Second))
134 
+						poll.WaitOn(t, pollForNewHealthCheck(ctx, apiClient, startTime, resp.ID), poll.WithTimeout(30*time.Second))
135 135
136 136 
 						testContainer.ExecT(ctx, t, apiClient, resp.ID, []string{"rm", "/tmp/unhealthy"}).AssertSuccess(t)
137 
-						poll.WaitOn(t, pollForHealthStatus(ctx, apiClient, resp.ID, container.Healthy), poll.WithDelay(100*time.Millisecond), poll.WithTimeout(30*time.Second))
137 
+						poll.WaitOn(t, pollForHealthStatus(ctx, apiClient, resp.ID, container.Healthy), poll.WithTimeout(30*time.Second))
138 138 
 					}
139 139 
 					// TODO(cpuguy83): test pause states... this seems to be rather undefined currently
140 140 
 				})
integration/container/run_linux_test.go
History View file @ b8db6d1
... ... 
@@ -8,7 +8,6 @@ import (
8 8 
 	"path/filepath"
9 9 
 	"strings"
10 10 
 	"testing"
11 
-	"time"
12 11
13 12 
 	containertypes "github.com/docker/docker/api/types/container"
14 13 
 	"github.com/docker/docker/api/types/versions"
... ... 
@@ -185,7 +184,7 @@ func TestRunConsoleSize(t *testing.T) {
185 185 
 		container.WithConsoleSize(57, 123),
186 186 
 	)
187 187
188 
-	poll.WaitOn(t, container.IsStopped(ctx, apiClient, cID), poll.WithDelay(100*time.Millisecond))
188 
+	poll.WaitOn(t, container.IsStopped(ctx, apiClient, cID))
189 189
190 190 
 	out, err := apiClient.ContainerLogs(ctx, cID, containertypes.LogsOptions{ShowStdout: true})
191 191 
 	assert.NilError(t, err)
... ... 
@@ -230,7 +229,7 @@ func TestRunWithAlternativeContainerdShim(t *testing.T) {
230 230 
 		container.WithRuntime("io.containerd.realfake.v42"),
231 231 
 	)
232 232
233 
-	poll.WaitOn(t, container.IsStopped(ctx, apiClient, cID), poll.WithDelay(100*time.Millisecond))
233 
+	poll.WaitOn(t, container.IsStopped(ctx, apiClient, cID))
234 234
235 235 
 	out, err := apiClient.ContainerLogs(ctx, cID, containertypes.LogsOptions{ShowStdout: true})
236 236 
 	assert.NilError(t, err)
... ... 
@@ -250,7 +249,7 @@ func TestRunWithAlternativeContainerdShim(t *testing.T) {
250 250 
 		container.WithCmd("sh", "-c", `echo 'Hello, world!'`),
251 251 
 	)
252 252
253 
-	poll.WaitOn(t, container.IsStopped(ctx, apiClient, cID), poll.WithDelay(100*time.Millisecond))
253 
+	poll.WaitOn(t, container.IsStopped(ctx, apiClient, cID))
254 254
255 255 
 	out, err = apiClient.ContainerLogs(ctx, cID, containertypes.LogsOptions{ShowStdout: true})
256 256 
 	assert.NilError(t, err)
... ... 
@@ -314,7 +313,7 @@ func TestStaticIPOutsideSubpool(t *testing.T) {
314 314 
 		container.WithIPv4(netname, "10.42.1.3"),
315 315 
 	)
316 316
317 
-	poll.WaitOn(t, container.IsStopped(ctx, apiClient, cID), poll.WithDelay(100*time.Millisecond))
317 
+	poll.WaitOn(t, container.IsStopped(ctx, apiClient, cID))
318 318
319 319 
 	out, err := apiClient.ContainerLogs(ctx, cID, containertypes.LogsOptions{ShowStdout: true})
320 320 
 	assert.NilError(t, err)
integration/container/stop_linux_test.go
History View file @ b8db6d1
... ... 
@@ -63,8 +63,7 @@ func TestStopContainerWithTimeout(t *testing.T) {
63 63 
 			err := apiClient.ContainerStop(ctx, id, containertypes.StopOptions{Timeout: &tc.timeout})
64 64 
 			assert.NilError(t, err)
65 65
66 
-			poll.WaitOn(t, container.IsStopped(ctx, apiClient, id),
67 
-				poll.WithDelay(100*time.Millisecond))
66 
+			poll.WaitOn(t, container.IsStopped(ctx, apiClient, id))
68 67
69 68 
 			inspect, err := apiClient.ContainerInspect(ctx, id)
70 69 
 			assert.NilError(t, err)
integration/container/stop_test.go
History View file @ b8db6d1
... ... 
@@ -27,7 +27,7 @@ func TestStopContainerWithRestartPolicyAlways(t *testing.T) {
27 27 
 	}
28 28
29 29 
 	for _, name := range names {
30 
-		poll.WaitOn(t, container.IsInState(ctx, apiClient, name, "running", "restarting"), poll.WithDelay(100*time.Millisecond))
30 
+		poll.WaitOn(t, container.IsInState(ctx, apiClient, name, "running", "restarting"))
31 31 
 	}
32 32
33 33 
 	for _, name := range names {
... ... 
@@ -36,6 +36,6 @@ func TestStopContainerWithRestartPolicyAlways(t *testing.T) {
36 36 
 	}
37 37
38 38 
 	for _, name := range names {
39 
-		poll.WaitOn(t, container.IsStopped(ctx, apiClient, name), poll.WithDelay(100*time.Millisecond))
39 
+		poll.WaitOn(t, container.IsStopped(ctx, apiClient, name))
40 40 
 	}
41 41 
 }
integration/container/stop_windows_test.go
History View file @ b8db6d1
... ... 
@@ -3,7 +3,6 @@ package container // import "github.com/docker/docker/integration/container"
3 3 
 import (
4 4 
 	"strconv"
5 5 
 	"testing"
6 
-	"time"
7 6
8 7 
 	containertypes "github.com/docker/docker/api/types/container"
9 8 
 	"github.com/docker/docker/integration/internal/container"
... ... 
@@ -58,8 +57,7 @@ func TestStopContainerWithTimeout(t *testing.T) {
58 58 
 			err := apiClient.ContainerStop(ctx, id, containertypes.StopOptions{Timeout: &d.timeout})
59 59 
 			assert.NilError(t, err)
60 60
61 
-			poll.WaitOn(t, container.IsStopped(ctx, apiClient, id),
62 
-				poll.WithDelay(100*time.Millisecond))
61 
+			poll.WaitOn(t, container.IsStopped(ctx, apiClient, id))
63 62
64 63 
 			inspect, err := apiClient.ContainerInspect(ctx, id)
65 64 
 			assert.NilError(t, err)
integration/container/update_test.go
History View file @ b8db6d1
... ... 
@@ -35,7 +35,7 @@ func TestUpdateRestartPolicy(t *testing.T) {
35 35 
 		timeout = 180 * time.Second
36 36 
 	}
37 37
38 
-	poll.WaitOn(t, container.IsInState(ctx, apiClient, cID, "exited"), poll.WithDelay(100*time.Millisecond), poll.WithTimeout(timeout))
38 
+	poll.WaitOn(t, container.IsInState(ctx, apiClient, cID, "exited"), poll.WithTimeout(timeout))
39 39
40 40 
 	inspect, err := apiClient.ContainerInspect(ctx, cID)
41 41 
 	assert.NilError(t, err)
integration/container/wait_test.go
History View file @ b8db6d1
... ... 
@@ -42,7 +42,7 @@ func TestWaitNonBlocked(t *testing.T) {
42 42
43 43 
 			ctx := testutil.StartSpan(ctx, t)
44 44 
 			containerID := container.Run(ctx, t, cli, container.WithCmd("sh", "-c", tc.cmd))
45 
-			poll.WaitOn(t, container.IsInState(ctx, cli, containerID, "exited"), poll.WithTimeout(30*time.Second), poll.WithDelay(100*time.Millisecond))
45 
+			poll.WaitOn(t, container.IsInState(ctx, cli, containerID, "exited"), poll.WithTimeout(30*time.Second))
46 46
47 47 
 			waitResC, errC := cli.ContainerWait(ctx, containerID, "")
48 48 
 			select {
integration/network/dns_test.go
History View file @ b8db6d1
... ... 
@@ -2,7 +2,6 @@ package network // import "github.com/docker/docker/integration/network"
2 2
3 3 
 import (
4 4 
 	"testing"
5 
-	"time"
6 5
7 6 
 	containertypes "github.com/docker/docker/api/types/container"
8 7 
 	"github.com/docker/docker/integration/internal/container"
... ... 
@@ -33,7 +32,7 @@ func TestDaemonDNSFallback(t *testing.T) {
33 33 
 	cid := container.Run(ctx, t, c, container.WithNetworkMode("test"), container.WithCmd("nslookup", "docker.com"))
34 34 
 	defer c.ContainerRemove(ctx, cid, containertypes.RemoveOptions{Force: true})
35 35
36 
-	poll.WaitOn(t, container.IsSuccessful(ctx, c, cid), poll.WithDelay(100*time.Millisecond), poll.WithTimeout(10*time.Second))
36 
+	poll.WaitOn(t, container.IsSuccessful(ctx, c, cid))
37 37 
 }
38 38
39 39 
 // Check that, when the internal DNS server's address is supplied as an external