deleted file mode 100644

@@ -1,8 +0,0 @@

-FROM busybox

-RUN echo 'dockerio:x:1001:1001::/bin:/bin/false' >> /etc/passwd

-RUN echo 'dockerio:x:1001:' >> /etc/group

-RUN touch /exists

-RUN chown dockerio.dockerio exists

-ADD test_dir /

-RUN [ $(ls -l /test_file | awk '{print $3":"$4}') = 'root:root' ]

-RUN [ $(ls -l /exists | awk '{print $3":"$4}') = 'dockerio:dockerio' ]

deleted file mode 100644

@@ -221,16 +221,25 @@ RUN [ $(ls -l /exists | awk '{print $3":"$4}') = 'dockerio:dockerio' ]`,

 }

 func TestBuildAddDirContentToRoot(t *testing.T) {

-	buildDirectory := filepath.Join(workingDirectory, "build_tests", "TestAdd")

-	out, exitCode, err := dockerCmdInDir(t, buildDirectory, "build", "-t", "testaddimg", "DirContentToRoot")

-	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 := "testadddircontenttoroot"

+	defer deleteImages(name)

+	ctx, err := fakeContext(`FROM busybox

+RUN echo 'dockerio:x:1001:1001::/bin:/bin/false' >> /etc/passwd

+RUN echo 'dockerio:x:1001:' >> /etc/group

+RUN touch /exists

+RUN chown dockerio.dockerio exists

+ADD test_dir /

+RUN [ $(ls -l /test_file | awk '{print $3":"$4}') = 'root:root' ]

+RUN [ $(ls -l /exists | awk '{print $3":"$4}') = 'dockerio:dockerio' ]`,

+		map[string]string{

+			"test_dir/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 directory contents to root")

 }