Browse Source

Rewrite TestBuildAddEtcToRoot to not use fixtures

Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Alexandr Morozov 10 years ago
parent
commit
570f1153b9

+ 0 - 2
integration-cli/build_tests/TestAdd/EtcToRoot/Dockerfile

@@ -1,2 +0,0 @@
-FROM scratch
-ADD . /

+ 13 - 8
integration-cli/docker_cli_build_test.go

@@ -301,16 +301,21 @@ func TestBuildAddWholeDirToRoot(t *testing.T) {
 	logDone("build - add whole directory to root")
 }
 
+// Testing #5941
 func TestBuildAddEtcToRoot(t *testing.T) {
-	buildDirectory := filepath.Join(workingDirectory, "build_tests", "TestAdd")
-	out, exitCode, err := dockerCmdInDir(t, buildDirectory, "build", "-t", "testaddimg", "EtcToRoot")
-	errorOut(err, t, fmt.Sprintf("build failed to complete: %v %v", out, err))
-
-	if err != nil || exitCode != 0 {
-		t.Fatal("failed to build the image")
+	name := "testaddetctoroot"
+	defer deleteImages(name)
+	ctx, err := fakeContext(`FROM scratch
+ADD . /`,
+		map[string]string{
+			"etc/test_file": "test1",
+		})
+	if err != nil {
+		t.Fatal(err)
+	}
+	if _, err := buildImageFromContext(name, ctx, true); err != nil {
+		t.Fatal(err)
 	}
-
-	deleteImages("testaddimg")
 	logDone("build - add etc directory to root")
 }