From 07ea87f779e1c960d7ecd816427b7a833fdb0909 Mon Sep 17 00:00:00 2001
From: LK4D4 <lk4d4math@gmail.com>
Date: Sun, 25 May 2014 22:26:50 +0400
Subject: [PATCH] Move maintainer build test to integration-cli

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

diff --git a/components/engine/integration-cli/docker_cli_build_test.go b/components/engine/integration-cli/docker_cli_build_test.go
index 931a61b57d..696f95b8e0 100644
--- a/components/engine/integration-cli/docker_cli_build_test.go
+++ b/components/engine/integration-cli/docker_cli_build_test.go
@@ -446,6 +446,20 @@ func TestBuildWithVolume(t *testing.T) {
 	logDone("build - with volume")
 }
 
+func TestBuildMaintainer(t *testing.T) {
+	checkSimpleBuild(t,
+		`
+        FROM scratch
+        MAINTAINER dockerio
+		`,
+		"testbuildimg",
+		"{{json .author}}",
+		`"dockerio"`)
+
+	deleteImages("testbuildimg")
+	logDone("build - maintainer")
+}
+
 // TODO: TestCaching
 
 // TODO: TestADDCacheInvalidation
diff --git a/components/engine/integration/buildfile_test.go b/components/engine/integration/buildfile_test.go
index c326e94cff..89154e343e 100644
--- a/components/engine/integration/buildfile_test.go
+++ b/components/engine/integration/buildfile_test.go
@@ -414,20 +414,6 @@ func buildImage(context testContextTemplate, t *testing.T, eng *engine.Engine, u
 	return image, err
 }
 
-func TestBuildMaintainer(t *testing.T) {
-	img, err := buildImage(testContextTemplate{`
-        from {IMAGE}
-        maintainer dockerio
-    `, nil, nil}, t, nil, true)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if img.Author != "dockerio" {
-		t.Fail()
-	}
-}
-
 func TestBuildUser(t *testing.T) {
 	img, err := buildImage(testContextTemplate{`
         from {IMAGE}