Merge pull request #8567 from LK4D4/add_log_done

Add logDone for TestBuildAddSingleFileToNonExistDir
This commit is contained in:
Jessie Frazelle 2014-10-17 11:20:12 -07:00
Родитель 09ceae5c9c fcfe80f633
Коммит 5a20dc67b0
1 изменённых файлов: 6 добавлений и 4 удалений

Просмотреть файл

@ -491,8 +491,8 @@ func TestBuildCopyWildcardCache(t *testing.T) {
logDone("build - copy wild card cache") logDone("build - copy wild card cache")
} }
func TestBuildAddSingleFileToNonExistDir(t *testing.T) { func TestBuildAddSingleFileToNonExistingDir(t *testing.T) {
name := "testaddsinglefiletononexistdir" name := "testaddsinglefiletononexistingdir"
defer deleteImages(name) defer deleteImages(name)
ctx, err := fakeContext(`FROM busybox ctx, err := fakeContext(`FROM busybox
RUN echo 'dockerio:x:1001:1001::/bin:/bin/false' >> /etc/passwd RUN echo 'dockerio:x:1001:1001::/bin:/bin/false' >> /etc/passwd
@ -512,6 +512,8 @@ RUN [ $(ls -l /exists | awk '{print $3":"$4}') = 'dockerio:dockerio' ]`,
if _, err := buildImageFromContext(name, ctx, true); err != nil { if _, err := buildImageFromContext(name, ctx, true); err != nil {
t.Fatal(err) t.Fatal(err)
} }
logDone("build - add single file to non-existing dir")
} }
func TestBuildAddDirContentToRoot(t *testing.T) { func TestBuildAddDirContentToRoot(t *testing.T) {
@ -537,8 +539,8 @@ RUN [ $(ls -l /exists | awk '{print $3":"$4}') = 'dockerio:dockerio' ]`,
logDone("build - add directory contents to root") logDone("build - add directory contents to root")
} }
func TestBuildAddDirContentToExistDir(t *testing.T) { func TestBuildAddDirContentToExistingDir(t *testing.T) {
name := "testadddircontenttoexistdir" name := "testadddircontenttoexistingdir"
defer deleteImages(name) defer deleteImages(name)
ctx, err := fakeContext(`FROM busybox ctx, err := fakeContext(`FROM busybox
RUN echo 'dockerio:x:1001:1001::/bin:/bin/false' >> /etc/passwd RUN echo 'dockerio:x:1001:1001::/bin:/bin/false' >> /etc/passwd