microsoft
/
docker
зеркало из https://github.com/microsoft/docker.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Merge pull request #14601 from runcom/cleanup-deleteImages 

Cleanup not needed calls to deleteImages
This commit is contained in:
Alexander Morozov 2015-07-13 14:04:20 -06:00
Родитель 9158ddef89 d3566fa0b1
Коммит 1da3843149
3 изменённых файлов: 0 добавлений и 9 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
integration-cli/docker_api_images_test.go
Просмотреть файл

@ -91,7 +91,6 @@ func (s *DockerSuite) TestApiImagesDelete(c *check.C) {
if err != nil { if err != nil {
c.Fatal(err) c.Fatal(err)
} }
defer deleteImages(name)
id := strings.TrimSpace(out) id := strings.TrimSpace(out)
if out, err := exec.Command(dockerBinary, "tag", name, "test:tag1").CombinedOutput(); err != nil { 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) out, err := buildImage(name, "FROM hello-world\nENV FOO bar", false)
c.Assert(err, check.IsNil) c.Assert(err, check.IsNil)
defer deleteImages(name)
id := strings.TrimSpace(out) id := strings.TrimSpace(out)
status, body, err := sockRequest("GET", "/images/"+id+"/history", nil) status, body, err := sockRequest("GET", "/images/"+id+"/history", nil)

4
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) { func (s *DockerSuite) TestBuildCopyWildcardInName(c *check.C) {
name := "testcopywildcardinname" name := "testcopywildcardinname"
defer deleteImages(name)
ctx, err := fakeContext(`FROM busybox ctx, err := fakeContext(`FROM busybox
COPY *.txt /tmp/ COPY *.txt /tmp/
RUN [ "$(cat /tmp/\*.txt)" = 'hi there' ] RUN [ "$(cat /tmp/\*.txt)" = 'hi there' ]
@ -3444,7 +3443,6 @@ func (s *DockerSuite) TestBuildDockerignoreCleanPaths(c *check.C) {
func (s *DockerSuite) TestBuildDockerignoreExceptions(c *check.C) { func (s *DockerSuite) TestBuildDockerignoreExceptions(c *check.C) {
name := "testbuilddockerignoreexceptions" name := "testbuilddockerignoreexceptions"
defer deleteImages(name)
dockerfile := ` dockerfile := `
FROM busybox FROM busybox
ADD . /bla ADD . /bla
@ -4140,7 +4138,6 @@ func (s *DockerSuite) TestBuildFromGIT(c *check.C) {
func (s *DockerSuite) TestBuildFromGITWithContext(c *check.C) { func (s *DockerSuite) TestBuildFromGITWithContext(c *check.C) {
name := "testbuildfromgit" name := "testbuildfromgit"
defer deleteImages(name)
git, err := fakeGIT("repo", map[string]string{ git, err := fakeGIT("repo", map[string]string{
"docker/Dockerfile": `FROM busybox "docker/Dockerfile": `FROM busybox
ADD first /first ADD first /first
@ -5323,7 +5320,6 @@ func (s *DockerSuite) TestBuildEmptyStringVolume(c *check.C) {
func (s *DockerSuite) TestBuildContainerWithCgroupParent(c *check.C) { func (s *DockerSuite) TestBuildContainerWithCgroupParent(c *check.C) {
testRequires(c, NativeExecDriver) testRequires(c, NativeExecDriver)
testRequires(c, SameHostDaemon) testRequires(c, SameHostDaemon)
defer deleteImages()
cgroupParent := "test" cgroupParent := "test"
data, err := ioutil.ReadFile("/proc/self/cgroup") data, err := ioutil.ReadFile("/proc/self/cgroup")

3
integration-cli/docker_cli_save_load_test.go
Просмотреть файл

@ -57,9 +57,6 @@ func (s *DockerSuite) TestSaveXzAndLoadRepoStdout(c *check.C) {
if err == nil { if err == nil {
c.Fatalf("the repo should not exist: %v", after) 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 // save a repo using xz+gz compression and try to load it using stdout