From 139b6ed3aa81d5d3c6ceaacc5041afca4d39d75a Mon Sep 17 00:00:00 2001
From: Alexandr Morozov <lk4d4@docker.com>
Date: Mon, 22 Sep 2014 19:41:13 +0400
Subject: [PATCH] Rewrite TestAddSingleFileToNonExistDir to not use fixtures

Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
---
 .../SingleFileToNonExistDir/Dockerfile        |  9 ------
 .../TestAdd/SingleFileToNonExistDir/test_file |  0
 integration-cli/docker_cli_build_test.go      | 29 ++++++++++++-------
 3 files changed, 19 insertions(+), 19 deletions(-)
 delete mode 100644 integration-cli/build_tests/TestAdd/SingleFileToNonExistDir/Dockerfile
 delete mode 100644 integration-cli/build_tests/TestAdd/SingleFileToNonExistDir/test_file

diff --git a/integration-cli/build_tests/TestAdd/SingleFileToNonExistDir/Dockerfile b/integration-cli/build_tests/TestAdd/SingleFileToNonExistDir/Dockerfile
deleted file mode 100644
index 661990b7f4028..0000000000000
--- a/integration-cli/build_tests/TestAdd/SingleFileToNonExistDir/Dockerfile
+++ /dev/null
@@ -1,9 +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_file /test_dir/
-RUN [ $(ls -l / | grep test_dir | awk '{print $3":"$4}') = 'root:root' ]
-RUN [ $(ls -l /test_dir/test_file | awk '{print $3":"$4}') = 'root:root' ]
-RUN [ $(ls -l /exists | awk '{print $3":"$4}') = 'dockerio:dockerio' ]
diff --git a/integration-cli/build_tests/TestAdd/SingleFileToNonExistDir/test_file b/integration-cli/build_tests/TestAdd/SingleFileToNonExistDir/test_file
deleted file mode 100644
index e69de29bb2d1d..0000000000000
diff --git a/integration-cli/docker_cli_build_test.go b/integration-cli/docker_cli_build_test.go
index 71db2eee54d21..147d28ed7a28a 100644
--- a/integration-cli/docker_cli_build_test.go
+++ b/integration-cli/docker_cli_build_test.go
@@ -198,17 +198,26 @@ func TestBuildCopyMultipleFilesToFile(t *testing.T) {
 }
 
 func TestBuildAddSingleFileToNonExistDir(t *testing.T) {
-	buildDirectory := filepath.Join(workingDirectory, "build_tests", "TestAdd")
-	out, exitCode, err := dockerCmdInDir(t, buildDirectory, "build", "-t", "testaddimg", "SingleFileToNonExistDir")
-	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 := "testaddsinglefiletononexistdir"
+	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_file /test_dir/
+RUN [ $(ls -l / | grep test_dir | awk '{print $3":"$4}') = 'root:root' ]
+RUN [ $(ls -l /test_dir/test_file | awk '{print $3":"$4}') = 'root:root' ]
+RUN [ $(ls -l /exists | awk '{print $3":"$4}') = 'dockerio:dockerio' ]`,
+		map[string]string{
+			"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 single file to non-existing dir")
 }
 
 func TestBuildAddDirContentToRoot(t *testing.T) {