p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rewrite TestBuildRm to not use fixtures

Browse Source 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: 52cf331206b9e50ba9b52f950b5a377179cf7aa5
Component: engine
This commit is contained in:
Alexandr Morozov
2014-09-24 13:15:55 +04:00
parent a1e93ec56c
commit beff003be9
3 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/engine/integration-cli/build_tests/TestBuildRm/Dockerfile
View File

@ -1,4 +0,0 @@
FROM busybox
ADD foo /
ADD foo /

1
components/engine/integration-cli/build_tests/TestBuildRm/foo
View File

@ -1 +0,0 @@
bar

28
components/engine/integration-cli/docker_cli_build_test.go
View File

@ -633,17 +633,23 @@ func TestBuildForceRm(t *testing.T) {
}
func TestBuildRm(t *testing.T) {
name := "testbuildrm"
defer deleteImages(name)
ctx, err := fakeContext("FROM scratch\nADD foo /\nADD foo /", map[string]string{"foo": "bar"})
if err != nil {
t.Fatal(err)
}
defer ctx.Close()
{
containerCountBefore, err := getContainerCount()
if err != nil {
t.Fatalf("failed to get the container count: %s", err)
}
buildDirectory := filepath.Join(workingDirectory, "build_tests", "TestBuildRm")
_, exitCode, err := dockerCmdInDir(t, buildDirectory, "build", "--rm", "-t", "testbuildrm", ".")
out, exitCode, err := dockerCmdInDir(t, ctx.Dir, "build", "--rm", "-t", name, ".")
if err != nil || exitCode != 0 {
t.Fatal("failed to build the image")
t.Fatal("failed to build the image", out)
}
containerCountAfter, err := getContainerCount()
@ -654,7 +660,7 @@ func TestBuildRm(t *testing.T) {
if containerCountBefore != containerCountAfter {
t.Fatalf("-rm shouldn't have left containers behind")
}
deleteImages("testbuildrm")
deleteImages(name)
}
{
@ -663,11 +669,10 @@ func TestBuildRm(t *testing.T) {
t.Fatalf("failed to get the container count: %s", err)
}
buildDirectory := filepath.Join(workingDirectory, "build_tests", "TestBuildRm")
_, exitCode, err := dockerCmdInDir(t, buildDirectory, "build", "-t", "testbuildrm", ".")
out, exitCode, err := dockerCmdInDir(t, ctx.Dir, "build", "-t", name, ".")
if err != nil || exitCode != 0 {
t.Fatal("failed to build the image")
t.Fatal("failed to build the image", out)
}
containerCountAfter, err := getContainerCount()
@ -678,7 +683,7 @@ func TestBuildRm(t *testing.T) {
if containerCountBefore != containerCountAfter {
t.Fatalf("--rm shouldn't have left containers behind")
}
deleteImages("testbuildrm")
deleteImages(name)
}
{
@ -687,11 +692,10 @@ func TestBuildRm(t *testing.T) {
t.Fatalf("failed to get the container count: %s", err)
}
buildDirectory := filepath.Join(workingDirectory, "build_tests", "TestBuildRm")
_, exitCode, err := dockerCmdInDir(t, buildDirectory, "build", "--rm=false", "-t", "testbuildrm", ".")
out, exitCode, err := dockerCmdInDir(t, ctx.Dir, "build", "--rm=false", "-t", name, ".")
if err != nil || exitCode != 0 {
t.Fatal("failed to build the image")
t.Fatal("failed to build the image", out)
}
containerCountAfter, err := getContainerCount()
@ -703,7 +707,7 @@ func TestBuildRm(t *testing.T) {
t.Fatalf("--rm=false should have left containers behind")
}
deleteAllContainers()
deleteImages("testbuildrm")
deleteImages(name)
}