From b05be686ec490ba68de82434f1ecaff01a84fcfa Mon Sep 17 00:00:00 2001
From: LK4D4 <lk4d4math@gmail.com>
Date: Mon, 26 May 2014 23:09:33 +0400
Subject: [PATCH] Move env 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 | 15 +++++++++++++++
 integration/buildfile_test.go            | 22 ----------------------
 2 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/integration-cli/docker_cli_build_test.go b/integration-cli/docker_cli_build_test.go
index b2cea9e52b..e22b09476c 100644
--- a/integration-cli/docker_cli_build_test.go
+++ b/integration-cli/docker_cli_build_test.go
@@ -496,6 +496,21 @@ func TestBuildRelativeWorkdir(t *testing.T) {
 	logDone("build - relative workdir")
 }
 
+func TestBuildEnv(t *testing.T) {
+	checkSimpleBuild(t,
+		`
+        FROM busybox
+        ENV PORT 4243
+		RUN [ $(env | grep PORT) = 'PORT=4243' ]
+        `,
+		"testbuildimg",
+		"{{json .config.Env}}",
+		`["HOME=/","PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin","PORT=4243"]`)
+
+	deleteImages("testbuildimg")
+	logDone("build - env")
+}
+
 // TODO: TestCaching
 
 // TODO: TestADDCacheInvalidation
diff --git a/integration/buildfile_test.go b/integration/buildfile_test.go
index 2416e140b5..28d5f3011c 100644
--- a/integration/buildfile_test.go
+++ b/integration/buildfile_test.go
@@ -414,28 +414,6 @@ func buildImage(context testContextTemplate, t *testing.T, eng *engine.Engine, u
 	return image, err
 }
 
-func TestBuildEnv(t *testing.T) {
-	img, err := buildImage(testContextTemplate{`
-        from {IMAGE}
-        env port 4243
-        `,
-		nil, nil}, t, nil, true)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	hasEnv := false
-	for _, envVar := range img.Config.Env {
-		if envVar == "port=4243" {
-			hasEnv = true
-			break
-		}
-	}
-	if !hasEnv {
-		t.Fail()
-	}
-}
-
 func TestBuildCmd(t *testing.T) {
 	img, err := buildImage(testContextTemplate{`
         from {IMAGE}