From 5e2ea69606850cf2da1c50ec4bc32c981999aafd Mon Sep 17 00:00:00 2001
From: Alexandr Morozov <lk4d4@docker.com>
Date: Mon, 22 Sep 2014 18:51:42 +0400
Subject: [PATCH] Rewrite TestAddSingleFileToWorkdir to not use fixtures

Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
---
 .../TestAdd/SingleFileToWorkdir/Dockerfile    |  2 -
 integration-cli/docker_cli_build_test.go      | 37 +++++++++----------
 2 files changed, 18 insertions(+), 21 deletions(-)
 delete mode 100644 integration-cli/build_tests/TestAdd/SingleFileToWorkdir/Dockerfile

diff --git a/integration-cli/build_tests/TestAdd/SingleFileToWorkdir/Dockerfile b/integration-cli/build_tests/TestAdd/SingleFileToWorkdir/Dockerfile
deleted file mode 100644
index 3f076718f..000000000
--- a/integration-cli/build_tests/TestAdd/SingleFileToWorkdir/Dockerfile
+++ /dev/null
@@ -1,2 +0,0 @@
-FROM busybox
-ADD test_file .
diff --git a/integration-cli/docker_cli_build_test.go b/integration-cli/docker_cli_build_test.go
index 6dafa70d9..80b08c76b 100644
--- a/integration-cli/docker_cli_build_test.go
+++ b/integration-cli/docker_cli_build_test.go
@@ -87,29 +87,28 @@ RUN [ $(ls -l /exists | awk '{print $3":"$4}') = 'dockerio:dockerio' ]`,
 
 // Issue #3960: "ADD src ." hangs
 func TestBuildAddSingleFileToWorkdir(t *testing.T) {
-	testDirName := "SingleFileToWorkdir"
-	sourceDirectory := filepath.Join(workingDirectory, "build_tests", "TestAdd", testDirName)
-	buildDirectory, err := ioutil.TempDir("", "test-build-add")
-	defer os.RemoveAll(buildDirectory)
-
-	err = copyWithCP(sourceDirectory, buildDirectory)
-	if err != nil {
-		t.Fatalf("failed to copy files to temporary directory: %s", err)
-	}
-
-	buildDirectory = filepath.Join(buildDirectory, testDirName)
-	f, err := os.OpenFile(filepath.Join(buildDirectory, "test_file"), os.O_CREATE, 0644)
+	name := "testaddsinglefiletoworkdir"
+	defer deleteImages(name)
+	ctx, err := fakeContext(`FROM busybox
+ADD test_file .`,
+		map[string]string{
+			"test_file": "test1",
+		})
 	if err != nil {
 		t.Fatal(err)
 	}
-	f.Close()
-	_, exitCode, err := dockerCmdInDirWithTimeout(5*time.Second, buildDirectory, "build", "-t", "testaddimg", ".")
-	if err != nil || exitCode != 0 {
-		t.Fatalf("build failed: %s", err)
+	done := make(chan struct{})
+	go func() {
+		if _, err := buildImageFromContext(name, ctx, true); err != nil {
+			t.Fatal(err)
+		}
+		close(done)
+	}()
+	select {
+	case <-time.After(5 * time.Second):
+		t.Fatal("Build with adding to workdir timed out")
+	case <-done:
 	}
-
-	deleteImages("testaddimg")
-
 	logDone("build - add single file to workdir")
 }