0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #43681 from thaJeztah/reduce_flakiness

Browse source 
fix flaky TestRunContainerWithRmFlag tests
This commit is contained in:
Tianon Gravi 2022-06-02 13:19:39 -07:00 • committed by GitHub
commit 0e04b514fb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
integration-cli/docker_cli_run_test.go
View file

@ -2745,30 +2745,29 @@ func (s *DockerSuite) TestRunVolumesFromRestartAfterRemoved(c *testing.T) {
// run container with --rm should remove container if exit code != 0
func (s *DockerSuite) TestRunContainerWithRmFlagExitCodeNotEqualToZero(c *testing.T) {
existingContainers := ExistingContainerIDs(c)
name := "flowers"
cli.Docker(cli.Args("run", "--name", name, "--rm", "busybox", "ls", "/notexists")).Assert(c, icmd.Expected{
ExitCode: 1,
})
out := cli.DockerCmd(c, "ps", "-q", "-a").Combined()
out = RemoveOutputForExistingElements(out, existingContainers)
if out != "" {
c.Fatal("Expected not to have containers", out)
}
cli.Docker(cli.Args("container", "inspect", name)).Assert(c, icmd.Expected{
ExitCode: 1,
Out: "[]\n",
Err: "o such container", // (N|n)o such container
})
}
func (s *DockerSuite) TestRunContainerWithRmFlagCannotStartContainer(c *testing.T) {
existingContainers := ExistingContainerIDs(c)
name := "sparkles"
cli.Docker(cli.Args("run", "--name", name, "--rm", "busybox", "commandNotFound")).Assert(c, icmd.Expected{
ExitCode: 127,
})
out := cli.DockerCmd(c, "ps", "-q", "-a").Combined()
out = RemoveOutputForExistingElements(out, existingContainers)
if out != "" {
c.Fatal("Expected not to have containers", out)
}
cli.Docker(cli.Args("container", "inspect", name)).Assert(c, icmd.Expected{
ExitCode: 1,
Out: "[]\n",
Err: "o such container", // (N|n)o such container
})
}
func (s *DockerSuite) TestRunPIDHostWithChildIsKillable(c *testing.T) {