From c58991f31a6a2ceaee7a3a327bfbc697b059ff51 Mon Sep 17 00:00:00 2001
From: LK4D4 <lk4d4math@gmail.com>
Date: Mon, 26 May 2014 23:15:40 +0400
Subject: [PATCH] Move cmd build test to integration-cli

Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
---
 integration-cli/docker_cli_build_test.go | 14 ++++++++++++++
 integration/buildfile_test.go            | 20 --------------------
 2 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/integration-cli/docker_cli_build_test.go b/integration-cli/docker_cli_build_test.go
index e22b09476c..ade7efe99f 100644
--- a/integration-cli/docker_cli_build_test.go
+++ b/integration-cli/docker_cli_build_test.go
@@ -511,6 +511,20 @@ func TestBuildEnv(t *testing.T) {
 	logDone("build - env")
 }
 
+func TestBuildCmd(t *testing.T) {
+	checkSimpleBuild(t,
+		`
+        FROM scratch
+        CMD ["/bin/echo", "Hello World"]
+        `,
+		"testbuildimg",
+		"{{json .config.Cmd}}",
+		`["/bin/echo","Hello World"]`)
+
+	deleteImages("testbuildimg")
+	logDone("build - cmd")
+}
+
 // TODO: TestCaching
 
 // TODO: TestADDCacheInvalidation
diff --git a/integration/buildfile_test.go b/integration/buildfile_test.go
index 28d5f3011c..5d508ff8f3 100644
--- a/integration/buildfile_test.go
+++ b/integration/buildfile_test.go
@@ -414,26 +414,6 @@ func buildImage(context testContextTemplate, t *testing.T, eng *engine.Engine, u
 	return image, err
 }
 
-func TestBuildCmd(t *testing.T) {
-	img, err := buildImage(testContextTemplate{`
-        from {IMAGE}
-        cmd ["/bin/echo", "Hello World"]
-        `,
-		nil, nil}, t, nil, true)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if img.Config.Cmd[0] != "/bin/echo" {
-		t.Log(img.Config.Cmd[0])
-		t.Fail()
-	}
-	if img.Config.Cmd[1] != "Hello World" {
-		t.Log(img.Config.Cmd[1])
-		t.Fail()
-	}
-}
-
 func TestBuildExpose(t *testing.T) {
 	img, err := buildImage(testContextTemplate{`
         from {IMAGE}