From 017a78b3c15be574ef2ea2b41adbb10d2d1c8b70 Mon Sep 17 00:00:00 2001
From: Alexandr Morozov <lk4d4math@gmail.com>
Date: Tue, 17 Jun 2014 11:49:07 +0400
Subject: [PATCH] Move TestBuildAddToSymlinkDest to integration-cli

Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: cc42eeac21caa962bed94878fe2eab00735cd00d
Component: engine
---
 .../integration-cli/docker_cli_build_test.go  | 23 +++++++++++++++++++
 .../engine/integration/buildfile_test.go      | 18 ---------------
 2 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/components/engine/integration-cli/docker_cli_build_test.go b/components/engine/integration-cli/docker_cli_build_test.go
index 95f73f7e6c..0837088322 100644
--- a/components/engine/integration-cli/docker_cli_build_test.go
+++ b/components/engine/integration-cli/docker_cli_build_test.go
@@ -1358,3 +1358,26 @@ func TestBuildOnBuildForbiddenMaintainer(t *testing.T) {
 	}
 	logDone("build - onbuild forbidden maintainer")
 }
+
+// gh #2446
+func TestBuildAddToSymlinkDest(t *testing.T) {
+	name := "testbuildaddtosymlinkdest"
+	defer deleteImages(name)
+	ctx, err := fakeContext(`FROM busybox
+        RUN mkdir /foo
+        RUN ln -s /foo /bar
+        ADD foo /bar/
+        RUN [ -f /bar/foo ]
+        RUN [ -f /foo/foo ]`,
+		map[string]string{
+			"foo": "hello",
+		})
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer ctx.Close()
+	if _, err := buildImageFromContext(name, ctx, true); err != nil {
+		t.Fatal(err)
+	}
+	logDone("build - add to symlink destination")
+}
diff --git a/components/engine/integration/buildfile_test.go b/components/engine/integration/buildfile_test.go
index c5c1fb0363..147ae353a2 100644
--- a/components/engine/integration/buildfile_test.go
+++ b/components/engine/integration/buildfile_test.go
@@ -412,21 +412,3 @@ func buildImage(context testContextTemplate, t *testing.T, eng *engine.Engine, u
 	err = json.NewDecoder(buffer).Decode(image)
 	return image, err
 }
-
-// gh #2446
-func TestBuildAddToSymlinkDest(t *testing.T) {
-	eng := NewTestEngine(t)
-	defer nuke(mkDaemonFromEngine(eng, t))
-
-	_, err := buildImage(testContextTemplate{`
-        from {IMAGE}
-        run mkdir /foo
-        run ln -s /foo /bar
-        add foo /bar/
-        run stat /bar/foo
-        `,
-		[][2]string{{"foo", "HEYO"}}, nil}, t, eng, true)
-	if err != nil {
-		t.Fatal(err)
-	}
-}