dilim/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-08-08 00:52:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

integration-cli: extend Windows poll timeout for --rm flag tests

Browse Source 
Extend the poll.WaitOn timeout for TestRunContainerWithRmFlagCannotStartContainer
and TestRunContainerWithRmFlagExitCodeNotEqualToZero on Windows from the default
10 seconds to 60 seconds.

On Windows, container teardown after docker run --rm involves:
1. HCS layer unmount (ReleaseLayer call via HCSSHIM)
2. EnsureRemoveAll with up to 50 retries × 100ms sleep on ERROR_ACCESS_DENIED /
   ERROR_SHARING_VIOLATION / ERROR_LOCK_VIOLATION / ERROR_DIR_NOT_EMPTY

Under CI load this can exceed the default 10-second poll budget, causing:
timeout hit after 10s: waiting for container 'sparkles' to be removed

This fix applies the same pattern already used in TestRunStdinBlockedAfterContainerExit
(added in a81aa78ceb) to the two --rm flag tests.

Signed-off-by: Gordon <GordonTheTurtle@users.noreply.github.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Gordon
2026-07-28 21:14:18 +00:00
committed by Sebastiaan van Stijn
parent cb7c8dd909
commit 2c77661013
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
integration-cli/docker_cli_run_test.go
View File

@@ -2673,7 +2673,11 @@ func (s *DockerCLIRunSuite) TestRunContainerWithRmFlagExitCodeNotEqualToZero(c *
ExitCode: 1,
})
poll.WaitOn(c, containerRemoved(name))
removeTimeout := 10 * time.Second
if DaemonIsWindows() {
removeTimeout = 60 * time.Second
}
poll.WaitOn(c, containerRemoved(name), poll.WithTimeout(removeTimeout))
}
func (s *DockerCLIRunSuite) TestRunContainerWithRmFlagCannotStartContainer(c *testing.T) {
@@ -2682,7 +2686,11 @@ func (s *DockerCLIRunSuite) TestRunContainerWithRmFlagCannotStartContainer(c *te
ExitCode: 127,
})
poll.WaitOn(c, containerRemoved(name))
removeTimeout := 10 * time.Second
if DaemonIsWindows() {
removeTimeout = 60 * time.Second
}
poll.WaitOn(c, containerRemoved(name), poll.WithTimeout(removeTimeout))
}
func containerRemoved(name string) poll.Check {