From 41d8a0c6c0268ba69fe16a5f8b825e46da1258a7 Mon Sep 17 00:00:00 2001
From: Johan Euphrosine <proppy@google.com>
Date: Mon, 21 Jul 2014 11:55:43 -0700
Subject: [PATCH] integration-cli: add more tests for BuildAddTar

Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
Upstream-commit: 30519330c723374526e7dbfc14807cc8da86c2c0
Component: engine
---
 .../build_tests/TestBuildAddTar/1/Dockerfile  |   3 --
 .../build_tests/TestBuildAddTar/2/Dockerfile  |   3 --
 .../build_tests/TestBuildAddTar/2/test.tar    | Bin 2560 -> 0 bytes
 .../build_tests/TestBuildAddTar/Dockerfile    |  14 ++++++++
 .../TestBuildAddTar/{1 => }/test.tar          | Bin
 .../integration-cli/docker_cli_build_test.go  |  33 ++++--------------
 6 files changed, 20 insertions(+), 33 deletions(-)
 delete mode 100644 components/engine/integration-cli/build_tests/TestBuildAddTar/1/Dockerfile
 delete mode 100644 components/engine/integration-cli/build_tests/TestBuildAddTar/2/Dockerfile
 delete mode 100644 components/engine/integration-cli/build_tests/TestBuildAddTar/2/test.tar
 create mode 100644 components/engine/integration-cli/build_tests/TestBuildAddTar/Dockerfile
 rename components/engine/integration-cli/build_tests/TestBuildAddTar/{1 => }/test.tar (100%)

diff --git a/components/engine/integration-cli/build_tests/TestBuildAddTar/1/Dockerfile b/components/engine/integration-cli/build_tests/TestBuildAddTar/1/Dockerfile
deleted file mode 100644
index 2091b0e4d9..0000000000
--- a/components/engine/integration-cli/build_tests/TestBuildAddTar/1/Dockerfile
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM busybox
-ADD test.tar /test.tar
-RUN cat /test.tar/test/foo
diff --git a/components/engine/integration-cli/build_tests/TestBuildAddTar/2/Dockerfile b/components/engine/integration-cli/build_tests/TestBuildAddTar/2/Dockerfile
deleted file mode 100644
index 830e9ddbee..0000000000
--- a/components/engine/integration-cli/build_tests/TestBuildAddTar/2/Dockerfile
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM busybox
-ADD test.tar /
-RUN cat /test/foo
diff --git a/components/engine/integration-cli/build_tests/TestBuildAddTar/2/test.tar b/components/engine/integration-cli/build_tests/TestBuildAddTar/2/test.tar
deleted file mode 100644
index 33639c647642cce352588cd4f13c021a0b222455..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2560
zcmeH^K?=k$2t~7=Q+R`M8WXQD*XTe4T?Ja_{$rYUGtle;h3ZC(V!rRow93=<4MgM+
zz?B?p#(}n4pSFP4;6r3aW(L%P$U*2Ut8V|UGA=4j=1*Q4AL>|2jsAW|IZ^`}lb32q
t@jvC<Q<U<ERQ*2j-~ajVk-P)!DeBmLbN}D-;~-(#2p9n)U<7VN;0Ma)EL;Ep

diff --git a/components/engine/integration-cli/build_tests/TestBuildAddTar/Dockerfile b/components/engine/integration-cli/build_tests/TestBuildAddTar/Dockerfile
new file mode 100644
index 0000000000..df4e9c9016
--- /dev/null
+++ b/components/engine/integration-cli/build_tests/TestBuildAddTar/Dockerfile
@@ -0,0 +1,14 @@
+FROM busybox
+ADD test.tar /
+RUN cat /test/foo | grep Hi
+ADD test.tar /test.tar
+RUN cat /test.tar/test/foo | grep Hi
+ADD test.tar /unlikely-to-exist
+RUN cat /unlikely-to-exist/test/foo | grep Hi
+ADD test.tar /unlikely-to-exist-trailing-slash/
+RUN cat /unlikely-to-exist-trailing-slash/test/foo | grep Hi
+RUN mkdir /existing-directory
+ADD test.tar /existing-directory
+RUN cat /existing-directory/test/foo | grep Hi
+ADD test.tar /existing-directory-trailing-slash/
+RUN cat /existing-directory-trailing-slash/test/foo | grep Hi
diff --git a/components/engine/integration-cli/build_tests/TestBuildAddTar/1/test.tar b/components/engine/integration-cli/build_tests/TestBuildAddTar/test.tar
similarity index 100%
rename from components/engine/integration-cli/build_tests/TestBuildAddTar/1/test.tar
rename to components/engine/integration-cli/build_tests/TestBuildAddTar/test.tar
diff --git a/components/engine/integration-cli/docker_cli_build_test.go b/components/engine/integration-cli/docker_cli_build_test.go
index 3b1c1c230e..66bbbf6dcd 100644
--- a/components/engine/integration-cli/docker_cli_build_test.go
+++ b/components/engine/integration-cli/docker_cli_build_test.go
@@ -1747,33 +1747,12 @@ RUN [ "$(cat /testfile)" = 'test!' ]`
 func TestBuildAddTar(t *testing.T) {
 	name := "testbuildaddtar"
 	defer deleteImages(name)
-	checkOutput := func(out string) {
-		n := -1
-		x := ""
-		for i, line := range strings.Split(out, "\n") {
-			if strings.HasPrefix(line, "Step 2") {
-				n = i + 2
-				x = line[strings.Index(line, "cat ")+4:]
-			}
-			if i == n {
-				if line != "Hi" {
-					t.Fatalf("Could not find contents of %s (expected 'Hi' got '%s'", x, line)
-				}
-				n = -2
-			}
-		}
-		if n > -2 {
-			t.Fatalf("Could not find contents of %s in build output", x)
-		}
-	}
 
-	for _, n := range []string{"1", "2"} {
-		buildDirectory := filepath.Join(workingDirectory, "build_tests", "TestBuildAddTar", n)
-		buildCmd := exec.Command(dockerBinary, "build", "-t", name, ".")
-		buildCmd.Dir = buildDirectory
-		out, _, err := runCommandWithOutput(buildCmd)
-		errorOut(err, t, fmt.Sprintf("build failed to complete for TestBuildAddTar/%s: %v", n, err))
-		checkOutput(out)
-	}
+        buildDirectory := filepath.Join(workingDirectory, "build_tests", "TestBuildAddTar")
+        buildCmd := exec.Command(dockerBinary, "build", "-t", name, ".")
+        buildCmd.Dir = buildDirectory
+        out, _, err := runCommandWithOutput(buildCmd)
+        errorOut(err, t, fmt.Sprintf("build failed to complete for TestBuildAddTar/%s: %v", n, err))
+
 	logDone("build - ADD tar")
 }