From 563708d78d42afe89374d5819fdb671ed72c2dad Mon Sep 17 00:00:00 2001 From: Brian Goff Date: Thu, 23 Apr 2015 09:20:17 -0400 Subject: [PATCH] Fix race with TestContainerApiCommit Signed-off-by: Brian Goff --- integration-cli/docker_api_containers_test.go | 4 ++-- integration-cli/docker_utils.go | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/integration-cli/docker_api_containers_test.go b/integration-cli/docker_api_containers_test.go index db4093733e..7a6468b160 100644 --- a/integration-cli/docker_api_containers_test.go +++ b/integration-cli/docker_api_containers_test.go @@ -625,7 +625,7 @@ func (s *DockerSuite) TestContainerApiCommit(c *check.C) { } id := strings.TrimSpace(string(out)) - name := "testcommit" + name := "testcommit" + stringid.GenerateRandomID() _, b, err := sockRequest("POST", "/commit?repo="+name+"&testtag=tag&container="+id, nil) if err != nil && !strings.Contains(err.Error(), "200 OK: 201") { c.Fatal(err) @@ -650,7 +650,7 @@ func (s *DockerSuite) TestContainerApiCommit(c *check.C) { // sanity check, make sure the image is what we think it is out, err = exec.Command(dockerBinary, "run", img.Id, "ls", "/test").CombinedOutput() if err != nil { - c.Fatal(out, err) + c.Fatalf("error checking commited image: %v - %q", err, string(out)) } } diff --git a/integration-cli/docker_utils.go b/integration-cli/docker_utils.go index 855352973e..cc5429a570 100644 --- a/integration-cli/docker_utils.go +++ b/integration-cli/docker_utils.go @@ -444,8 +444,7 @@ func unpauseAllContainers() error { } func deleteImages(images ...string) error { - args := make([]string, 1, 2) - args[0] = "rmi" + args := []string{"rmi", "-f"} args = append(args, images...) rmiCmd := exec.Command(dockerBinary, args...) exitCode, err := runCommand(rmiCmd) @@ -453,7 +452,6 @@ func deleteImages(images ...string) error { if exitCode != 0 && err == nil { err = fmt.Errorf("failed to remove image: `docker rmi` exit is non-zero") } - return err }