0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rewrite TestBuildForceRm to not use fixtures

Browse source 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
This commit is contained in:
Alexandr Morozov 2014-09-24 12:29:27 +04:00
parent 8dd11c7175
commit 1625cbfc4c
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
integration-cli/build_tests/TestBuildForceRm/Dockerfile
View file

@ -1,3 +0,0 @@
FROM busybox
RUN true
RUN thiswillfail

12
integration-cli/docker_cli_build_test.go
View file

@ -604,10 +604,16 @@ func TestBuildForceRm(t *testing.T) {
if err != nil {
t.Fatalf("failed to get the container count: %s", err)
}
name := "testbuildforcerm"
defer deleteImages(name)
ctx, err := fakeContext("FROM scratch\nRUN true\nRUN thiswillfail", nil)
if err != nil {
t.Fatal(err)
}
defer ctx.Close()
buildDirectory := filepath.Join(workingDirectory, "build_tests", "TestBuildForceRm")
buildCmd := exec.Command(dockerBinary, "build", "--force-rm", ".")
buildCmd.Dir = buildDirectory
buildCmd := exec.Command(dockerBinary, "build", "-t", name, "--force-rm", ".")
buildCmd.Dir = ctx.Dir
_, exitCode, err := runCommandWithOutput(buildCmd)
if err == nil || exitCode == 0 {