Bläddra i källkod

Move TestBuildAddToSymlinkDest to integration-cli

Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Alexandr Morozov 11 år sedan
förälder
incheckning
cc42eeac21
2 ändrade filer med 23 tillägg och 18 borttagningar
  1. 23 0
      integration-cli/docker_cli_build_test.go
  2. 0 18
      integration/buildfile_test.go

+ 23 - 0
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")
+}

+ 0 - 18
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)
-	}
-}