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

Cleanup not needed calls to deleteImages

Browse source 
Signed-off-by: Antonio Murdaca <runcom@linux.com>
This commit is contained in:
Antonio Murdaca 2015-07-13 20:29:59 +02:00
parent 4ef67b79bc
commit d3566fa0b1
3 changed files with 0 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
integration-cli/docker_api_images_test.go
View file

@ -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)

4
integration-cli/docker_cli_build_test.go
View file

@ -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")

3
integration-cli/docker_cli_save_load_test.go
View file

@ -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