From 1625cbfc4c02843ff0fbbf43bd46c13698609f2a Mon Sep 17 00:00:00 2001 From: Alexandr Morozov Date: Wed, 24 Sep 2014 12:29:27 +0400 Subject: [PATCH] Rewrite TestBuildForceRm to not use fixtures Signed-off-by: Alexandr Morozov --- .../build_tests/TestBuildForceRm/Dockerfile | 3 --- integration-cli/docker_cli_build_test.go | 12 +++++++++--- 2 files changed, 9 insertions(+), 6 deletions(-) delete mode 100644 integration-cli/build_tests/TestBuildForceRm/Dockerfile diff --git a/integration-cli/build_tests/TestBuildForceRm/Dockerfile b/integration-cli/build_tests/TestBuildForceRm/Dockerfile deleted file mode 100644 index 8468edd4cea4e..0000000000000 --- a/integration-cli/build_tests/TestBuildForceRm/Dockerfile +++ /dev/null @@ -1,3 +0,0 @@ -FROM busybox -RUN true -RUN thiswillfail diff --git a/integration-cli/docker_cli_build_test.go b/integration-cli/docker_cli_build_test.go index b68044e682b6b..0eecb58dfebfc 100644 --- a/integration-cli/docker_cli_build_test.go +++ b/integration-cli/docker_cli_build_test.go @@ -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 {