From 40630ce4b65755683e496bb7dbf3779b96ec5393 Mon Sep 17 00:00:00 2001
From: LK4D4 <lk4d4math@gmail.com>
Date: Sun, 25 May 2014 22:41:47 +0400
Subject: [PATCH] Move relative workdir 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 | 20 ++++++++++++++++++++
 integration/buildfile_test.go            | 19 -------------------
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/integration-cli/docker_cli_build_test.go b/integration-cli/docker_cli_build_test.go
index af106a95e3..b2cea9e52b 100644
--- a/integration-cli/docker_cli_build_test.go
+++ b/integration-cli/docker_cli_build_test.go
@@ -476,6 +476,26 @@ func TestBuildUser(t *testing.T) {
 	logDone("build - user")
 }
 
+func TestBuildRelativeWorkdir(t *testing.T) {
+	checkSimpleBuild(t,
+		`
+		FROM busybox
+		RUN [ "$PWD" = '/' ]
+		WORKDIR test1
+		RUN [ "$PWD" = '/test1' ]
+		WORKDIR /test2
+		RUN [ "$PWD" = '/test2' ]
+		WORKDIR test3
+		RUN [ "$PWD" = '/test2/test3' ]
+		`,
+		"testbuildimg",
+		"{{json .config.WorkingDir}}",
+		`"/test2/test3"`)
+
+	deleteImages("testbuildimg")
+	logDone("build - relative workdir")
+}
+
 // TODO: TestCaching
 
 // TODO: TestADDCacheInvalidation
diff --git a/integration/buildfile_test.go b/integration/buildfile_test.go
index 26a41c6514..2416e140b5 100644
--- a/integration/buildfile_test.go
+++ b/integration/buildfile_test.go
@@ -414,25 +414,6 @@ func buildImage(context testContextTemplate, t *testing.T, eng *engine.Engine, u
 	return image, err
 }
 
-func TestBuildRelativeWorkdir(t *testing.T) {
-	img, err := buildImage(testContextTemplate{`
-		FROM {IMAGE}
-		RUN [ "$PWD" = '/' ]
-		WORKDIR test1
-		RUN [ "$PWD" = '/test1' ]
-		WORKDIR /test2
-		RUN [ "$PWD" = '/test2' ]
-		WORKDIR test3
-		RUN [ "$PWD" = '/test2/test3' ]
-	`, nil, nil}, t, nil, true)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if img.Config.WorkingDir != "/test2/test3" {
-		t.Fatalf("Expected workdir to be '/test2/test3', received '%s'", img.Config.WorkingDir)
-	}
-}
-
 func TestBuildEnv(t *testing.T) {
 	img, err := buildImage(testContextTemplate{`
         from {IMAGE}