Selaa lähdekoodia

Rewrite TestBuildForceRm to not use fixtures

Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Alexandr Morozov 10 vuotta sitten
vanhempi
commit
1625cbfc4c

+ 0 - 3
integration-cli/build_tests/TestBuildForceRm/Dockerfile

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

+ 9 - 3
integration-cli/docker_cli_build_test.go

@@ -604,10 +604,16 @@ func TestBuildForceRm(t *testing.T) {
 	if err != nil {
 	if err != nil {
 		t.Fatalf("failed to get the container count: %s", err)
 		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)
 	_, exitCode, err := runCommandWithOutput(buildCmd)
 
 
 	if err == nil || exitCode == 0 {
 	if err == nil || exitCode == 0 {