Merge pull request #53223 from GordonTheTurtle/fix/43679-windows-rm-poll-timeout

integration-cli: extend Windows poll timeout for --rm flag tests
This commit is contained in:
Sebastiaan van Stijn
2026-07-30 02:17:14 +02:00
committed by GitHub

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 {