kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #43733 from thaJeztah/fix_flaky_TestRunContainerWithRmFlag

Browse source 
fix flaky TestRunContainerWithRmFlag tests (take 2)
This commit is contained in:
Sebastiaan van Stijn 2022-06-22 13:16:31 +02:00 • committed by GitHub
commit c17a566b0d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
integration-cli/docker_cli_run_test.go
View file

@ -34,6 +34,7 @@ import (
"github.com/moby/sys/mountinfo"
"gotest.tools/v3/assert"
"gotest.tools/v3/icmd"
"gotest.tools/v3/poll"
"gotest.tools/v3/skip"
)
@ -2750,11 +2751,7 @@ func (s *DockerSuite) TestRunContainerWithRmFlagExitCodeNotEqualToZero(c *testin
ExitCode: 1,
})
cli.Docker(cli.Args("container", "inspect", name)).Assert(c, icmd.Expected{
ExitCode: 1,
Out: "[]\n",
Err: "o such container", // (N|n)o such container
})
poll.WaitOn(c, containerRemoved(name))
}
func (s *DockerSuite) TestRunContainerWithRmFlagCannotStartContainer(c *testing.T) {
@ -2763,11 +2760,21 @@ func (s *DockerSuite) TestRunContainerWithRmFlagCannotStartContainer(c *testing.
ExitCode: 127,
})
cli.Docker(cli.Args("container", "inspect", name)).Assert(c, icmd.Expected{
ExitCode: 1,
Out: "[]\n",
Err: "o such container", // (N|n)o such container
})
poll.WaitOn(c, containerRemoved(name))
}
func containerRemoved(name string) poll.Check {
return func(l poll.LogT) poll.Result {
err := cli.Docker(cli.Args("container", "inspect", "--format='{{.ID}}'", name)).Compare(icmd.Expected{
ExitCode: 1,
Out: "",
Err: "o such container", // (N|n)o such container
})
if err != nil {
return poll.Continue("waiting for container '%s' to be removed", name)
}
return poll.Success()
}
}
func (s *DockerSuite) TestRunPIDHostWithChildIsKillable(c *testing.T) {