dilim/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-06-30 19:58:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #52879 from vvoland/work-flaky2

Browse Source 
integration/container: Extend Windows container state waits
This commit is contained in:
Paweł Gronowski
2026-06-15 21:04:55 +02:00
committed by GitHub
parent 0a95041b7d 1ba0b7b9c4
commit 17c3b61055
3 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
integration/container/remove_test.go
View File

@@ -36,7 +36,11 @@ func TestRemoveContainerWithRemovedVolume(t *testing.T) {
tempDir := fs.NewDir(t, "test-rm-container-with-removed-volume", fs.WithMode(0o755))
cID := container.Run(ctx, t, apiClient, container.WithCmd("true"), container.WithBind(tempDir.Path(), dPath("/test")))
poll.WaitOn(t, container.IsInState(ctx, apiClient, cID, containertypes.StateExited))
var pollOps []poll.SettingOp
if testEnv.DaemonInfo.OSType == "windows" {
pollOps = append(pollOps, poll.WithTimeout(StopContainerWindowsPollTimeout))
}
poll.WaitOn(t, container.IsInState(ctx, apiClient, cID, containertypes.StateExited), pollOps...)
err := os.RemoveAll(tempDir.Path())
assert.NilError(t, err)

6
integration/container/rename_test.go
View File

@@ -144,7 +144,11 @@ func TestRenameAnonymousContainer(t *testing.T) {
}
c.HostConfig.NetworkMode = containertypes.NetworkMode(networkName)
}, container.WithCmd("ping", count, "1", container1Name))
poll.WaitOn(t, container.IsInState(ctx, apiClient, cID, containertypes.StateExited))
var pollOps []poll.SettingOp
if testEnv.DaemonInfo.OSType == "windows" {
pollOps = append(pollOps, poll.WithTimeout(StopContainerWindowsPollTimeout))
}
poll.WaitOn(t, container.IsInState(ctx, apiClient, cID, containertypes.StateExited), pollOps...)
inspect, err := apiClient.ContainerInspect(ctx, cID, client.ContainerInspectOptions{})
assert.NilError(t, err)

7
integration/container/stop_test.go
View File

@@ -41,8 +41,13 @@ func TestStopContainerWithRestartPolicyAlways(t *testing.T) {
assert.NilError(t, err)
}
var pollOpts []poll.SettingOp
if testEnv.DaemonInfo.OSType == "windows" {
pollOpts = append(pollOpts, poll.WithTimeout(StopContainerWindowsPollTimeout))
}
for _, name := range names {
poll.WaitOn(t, container.IsStopped(ctx, apiClient, name))
poll.WaitOn(t, container.IsStopped(ctx, apiClient, name), pollOpts...)
}
}