From 32980488fe5fa48e44defdd557fcfe54f5adab4f Mon Sep 17 00:00:00 2001 From: Alexandr Morozov Date: Wed, 24 Sep 2014 16:55:52 +0400 Subject: [PATCH] Rewrite TestContextTar tests to not use fixtures Signed-off-by: Alexandr Morozov Upstream-commit: d302d9296125d2c7abf4adf992fd6739a19d5fbd Component: engine --- .../build_tests/TestContextTar/Dockerfile | 3 --- .../build_tests/TestContextTar/foo | 1 - .../integration-cli/docker_cli_build_test.go | 21 ++++++++++++++----- 3 files changed, 16 insertions(+), 9 deletions(-) delete mode 100644 components/engine/integration-cli/build_tests/TestContextTar/Dockerfile delete mode 100644 components/engine/integration-cli/build_tests/TestContextTar/foo diff --git a/components/engine/integration-cli/build_tests/TestContextTar/Dockerfile b/components/engine/integration-cli/build_tests/TestContextTar/Dockerfile deleted file mode 100644 index 41380570c1..0000000000 --- a/components/engine/integration-cli/build_tests/TestContextTar/Dockerfile +++ /dev/null @@ -1,3 +0,0 @@ -FROM busybox -ADD foo /foo -CMD ["cat", "/foo"] diff --git a/components/engine/integration-cli/build_tests/TestContextTar/foo b/components/engine/integration-cli/build_tests/TestContextTar/foo deleted file mode 100644 index 257cc5642c..0000000000 --- a/components/engine/integration-cli/build_tests/TestContextTar/foo +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/components/engine/integration-cli/docker_cli_build_test.go b/components/engine/integration-cli/docker_cli_build_test.go index 9ae4ce94c6..9e75d0cb51 100644 --- a/components/engine/integration-cli/docker_cli_build_test.go +++ b/components/engine/integration-cli/docker_cli_build_test.go @@ -1414,20 +1414,31 @@ func TestBuildADDLocalAndRemoteFilesWithCache(t *testing.T) { } func testContextTar(t *testing.T, compression archive.Compression) { - contextDirectory := filepath.Join(workingDirectory, "build_tests", "TestContextTar") - context, err := archive.Tar(contextDirectory, compression) - + ctx, err := fakeContext( + `FROM busybox +ADD foo /foo +CMD ["cat", "/foo"]`, + map[string]string{ + "foo": "bar", + }, + ) + defer ctx.Close() + if err != nil { + t.Fatal(err) + } + context, err := archive.Tar(ctx.Dir, compression) if err != nil { t.Fatalf("failed to build context tar: %v", err) } - buildCmd := exec.Command(dockerBinary, "build", "-t", "contexttar", "-") + name := "contexttar" + buildCmd := exec.Command(dockerBinary, "build", "-t", name, "-") + defer deleteImages(name) buildCmd.Stdin = context out, exitCode, err := runCommandWithOutput(buildCmd) if err != nil || exitCode != 0 { t.Fatalf("build failed to complete: %v %v", out, err) } - deleteImages("contexttar") logDone(fmt.Sprintf("build - build an image with a context tar, compression: %v", compression)) }