From cfa4999d695d98f30d942460576d5f9c03a64d92 Mon Sep 17 00:00:00 2001
From: Tibor Vass <teabee89@gmail.com>
Date: Tue, 8 Jul 2014 15:34:04 -0400
Subject: [PATCH] Tests for ADD tar

Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
---
 .../build_tests/TestBuildAddTar/1/Dockerfile  |   3 ++
 .../build_tests/TestBuildAddTar/1/test.tar    | Bin 0 -> 2560 bytes
 .../build_tests/TestBuildAddTar/2/Dockerfile  |   3 ++
 .../build_tests/TestBuildAddTar/2/test.tar    | Bin 0 -> 2560 bytes
 integration-cli/docker_cli_build_test.go      |  32 ++++++++++++++++++
 5 files changed, 38 insertions(+)
 create mode 100644 integration-cli/build_tests/TestBuildAddTar/1/Dockerfile
 create mode 100644 integration-cli/build_tests/TestBuildAddTar/1/test.tar
 create mode 100644 integration-cli/build_tests/TestBuildAddTar/2/Dockerfile
 create mode 100644 integration-cli/build_tests/TestBuildAddTar/2/test.tar

diff --git a/integration-cli/build_tests/TestBuildAddTar/1/Dockerfile b/integration-cli/build_tests/TestBuildAddTar/1/Dockerfile
new file mode 100644
index 0000000000..2091b0e4d9
--- /dev/null
+++ b/integration-cli/build_tests/TestBuildAddTar/1/Dockerfile
@@ -0,0 +1,3 @@
+FROM busybox
+ADD test.tar /test.tar
+RUN cat /test.tar/test/foo
diff --git a/integration-cli/build_tests/TestBuildAddTar/1/test.tar b/integration-cli/build_tests/TestBuildAddTar/1/test.tar
new file mode 100644
index 0000000000000000000000000000000000000000..33639c647642cce352588cd4f13c021a0b222455
GIT binary patch
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

literal 0
HcmV?d00001

diff --git a/integration-cli/build_tests/TestBuildAddTar/2/Dockerfile b/integration-cli/build_tests/TestBuildAddTar/2/Dockerfile
new file mode 100644
index 0000000000..830e9ddbee
--- /dev/null
+++ b/integration-cli/build_tests/TestBuildAddTar/2/Dockerfile
@@ -0,0 +1,3 @@
+FROM busybox
+ADD test.tar /
+RUN cat /test/foo
diff --git a/integration-cli/build_tests/TestBuildAddTar/2/test.tar b/integration-cli/build_tests/TestBuildAddTar/2/test.tar
new file mode 100644
index 0000000000000000000000000000000000000000..33639c647642cce352588cd4f13c021a0b222455
GIT binary patch
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

literal 0
HcmV?d00001

diff --git a/integration-cli/docker_cli_build_test.go b/integration-cli/docker_cli_build_test.go
index df0cfcc88e..039423e06c 100644
--- a/integration-cli/docker_cli_build_test.go
+++ b/integration-cli/docker_cli_build_test.go
@@ -1731,3 +1731,35 @@ RUN [ "$(cat /testfile)" = 'test!' ]`
 	}
 	logDone("build - add and run script")
 }
+
+func TestBuildAddTar(t *testing.T) {
+
+	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", "testbuildaddtar", ".")
+		buildCmd.Dir = buildDirectory
+		out, _, err := runCommandWithOutput(buildCmd)
+		errorOut(err, t, fmt.Sprintf("build failed to complete for TestBuildAddTar/%s: %v", n, err))
+		checkOutput(out)
+	}
+}