From b0b0bf7337a6ea777a7769ed69fc306d5792683c Mon Sep 17 00:00:00 2001 From: Alexandr Morozov Date: Tue, 14 Oct 2014 11:17:41 -0700 Subject: [PATCH 1/2] Add logDone for TestBuildAddSingleFileToNonExistDir Signed-off-by: Alexandr Morozov Upstream-commit: fbaa41b5aa920ca752481e1b94aeff29857cb76d Component: engine --- components/engine/integration-cli/docker_cli_build_test.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/components/engine/integration-cli/docker_cli_build_test.go b/components/engine/integration-cli/docker_cli_build_test.go index e456d579ab..399de8a6b2 100644 --- a/components/engine/integration-cli/docker_cli_build_test.go +++ b/components/engine/integration-cli/docker_cli_build_test.go @@ -509,6 +509,8 @@ RUN [ $(ls -l /exists | awk '{print $3":"$4}') = 'dockerio:dockerio' ]`, if _, err := buildImageFromContext(name, ctx, true); err != nil { t.Fatal(err) } + + logDone("build - add single file to non-existing dir") } func TestBuildAddDirContentToRoot(t *testing.T) { From 2c00860ff942e087b693e43b26c661e0e2ab5f6b Mon Sep 17 00:00:00 2001 From: Alexandr Morozov Date: Tue, 14 Oct 2014 11:47:01 -0700 Subject: [PATCH 2/2] Minor fix of tests names Signed-off-by: Alexandr Morozov Upstream-commit: fcfe80f63397c0a8bdd6605798c0639ec3dcda56 Component: engine --- .../engine/integration-cli/docker_cli_build_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/components/engine/integration-cli/docker_cli_build_test.go b/components/engine/integration-cli/docker_cli_build_test.go index 399de8a6b2..810010a264 100644 --- a/components/engine/integration-cli/docker_cli_build_test.go +++ b/components/engine/integration-cli/docker_cli_build_test.go @@ -488,8 +488,8 @@ func TestBuildCopyWildcardCache(t *testing.T) { logDone("build - copy wild card cache") } -func TestBuildAddSingleFileToNonExistDir(t *testing.T) { - name := "testaddsinglefiletononexistdir" +func TestBuildAddSingleFileToNonExistingDir(t *testing.T) { + name := "testaddsinglefiletononexistingdir" defer deleteImages(name) ctx, err := fakeContext(`FROM busybox RUN echo 'dockerio:x:1001:1001::/bin:/bin/false' >> /etc/passwd @@ -536,8 +536,8 @@ RUN [ $(ls -l /exists | awk '{print $3":"$4}') = 'dockerio:dockerio' ]`, logDone("build - add directory contents to root") } -func TestBuildAddDirContentToExistDir(t *testing.T) { - name := "testadddircontenttoexistdir" +func TestBuildAddDirContentToExistingDir(t *testing.T) { + name := "testadddircontenttoexistingdir" defer deleteImages(name) ctx, err := fakeContext(`FROM busybox RUN echo 'dockerio:x:1001:1001::/bin:/bin/false' >> /etc/passwd