From d3566fa0b1130fb938ad55da69fee2b7790dc3cf Mon Sep 17 00:00:00 2001 From: Antonio Murdaca Date: Mon, 13 Jul 2015 20:29:59 +0200 Subject: [PATCH] Cleanup not needed calls to deleteImages Signed-off-by: Antonio Murdaca --- integration-cli/docker_api_images_test.go | 2 -- integration-cli/docker_cli_build_test.go | 4 ---- integration-cli/docker_cli_save_load_test.go | 3 --- 3 files changed, 9 deletions(-) diff --git a/integration-cli/docker_api_images_test.go b/integration-cli/docker_api_images_test.go index 573a89046f..0180705361 100644 --- a/integration-cli/docker_api_images_test.go +++ b/integration-cli/docker_api_images_test.go @@ -91,7 +91,6 @@ func (s *DockerSuite) TestApiImagesDelete(c *check.C) { if err != nil { c.Fatal(err) } - defer deleteImages(name) id := strings.TrimSpace(out) if out, err := exec.Command(dockerBinary, "tag", name, "test:tag1").CombinedOutput(); err != nil { @@ -117,7 +116,6 @@ func (s *DockerSuite) TestApiImagesHistory(c *check.C) { out, err := buildImage(name, "FROM hello-world\nENV FOO bar", false) c.Assert(err, check.IsNil) - defer deleteImages(name) id := strings.TrimSpace(out) status, body, err := sockRequest("GET", "/images/"+id+"/history", nil) diff --git a/integration-cli/docker_cli_build_test.go b/integration-cli/docker_cli_build_test.go index f0b0dc3cdb..6a9259d779 100644 --- a/integration-cli/docker_cli_build_test.go +++ b/integration-cli/docker_cli_build_test.go @@ -1156,7 +1156,6 @@ func (s *DockerSuite) TestBuildCopyWildcardNoFind(c *check.C) { func (s *DockerSuite) TestBuildCopyWildcardInName(c *check.C) { name := "testcopywildcardinname" - defer deleteImages(name) ctx, err := fakeContext(`FROM busybox COPY *.txt /tmp/ RUN [ "$(cat /tmp/\*.txt)" = 'hi there' ] @@ -3444,7 +3443,6 @@ func (s *DockerSuite) TestBuildDockerignoreCleanPaths(c *check.C) { func (s *DockerSuite) TestBuildDockerignoreExceptions(c *check.C) { name := "testbuilddockerignoreexceptions" - defer deleteImages(name) dockerfile := ` FROM busybox ADD . /bla @@ -4140,7 +4138,6 @@ func (s *DockerSuite) TestBuildFromGIT(c *check.C) { func (s *DockerSuite) TestBuildFromGITWithContext(c *check.C) { name := "testbuildfromgit" - defer deleteImages(name) git, err := fakeGIT("repo", map[string]string{ "docker/Dockerfile": `FROM busybox ADD first /first @@ -5323,7 +5320,6 @@ func (s *DockerSuite) TestBuildEmptyStringVolume(c *check.C) { func (s *DockerSuite) TestBuildContainerWithCgroupParent(c *check.C) { testRequires(c, NativeExecDriver) testRequires(c, SameHostDaemon) - defer deleteImages() cgroupParent := "test" data, err := ioutil.ReadFile("/proc/self/cgroup") diff --git a/integration-cli/docker_cli_save_load_test.go b/integration-cli/docker_cli_save_load_test.go index c538890398..e59e6b561d 100644 --- a/integration-cli/docker_cli_save_load_test.go +++ b/integration-cli/docker_cli_save_load_test.go @@ -57,9 +57,6 @@ func (s *DockerSuite) TestSaveXzAndLoadRepoStdout(c *check.C) { if err == nil { c.Fatalf("the repo should not exist: %v", after) } - - deleteImages(repoName) - } // save a repo using xz+gz compression and try to load it using stdout