Skip to content

Commit

Permalink
Rewrite TestBuildCopyDirContentToRoot to not use fixtures
Browse files Browse the repository at this point in the history
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
  • Loading branch information
LK4D4 committed Oct 17, 2014
1 parent 24d83af commit 832618a
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 14 deletions.

This file was deleted.

Empty file.
24 changes: 18 additions & 6 deletions integration-cli/docker_cli_build_test.go
Expand Up @@ -736,13 +736,25 @@ RUN [ $(ls -l /exists | awk '{print $3":"$4}') = 'dockerio:dockerio' ]`,
}

func TestBuildCopyDirContentToRoot(t *testing.T) {
buildDirectory := filepath.Join(workingDirectory, "build_tests", "TestCopy")
if out, _, err := dockerCmdInDir(t, buildDirectory, "build", "-t", "testcopyimg", "DirContentToRoot"); err != nil {
t.Fatalf("build failed to complete: %s, %v", out, err)
name := "testcopydircontenttoroot"
defer deleteImages(name)
ctx, err := fakeContext(`FROM busybox
RUN echo 'dockerio:x:1001:1001::/bin:/bin/false' >> /etc/passwd
RUN echo 'dockerio:x:1001:' >> /etc/group
RUN touch /exists
RUN chown dockerio.dockerio exists
COPY test_dir /
RUN [ $(ls -l /test_file | awk '{print $3":"$4}') = 'root:root' ]
RUN [ $(ls -l /exists | awk '{print $3":"$4}') = 'dockerio:dockerio' ]`,
map[string]string{
"test_dir/test_file": "test1",
})
if err != nil {
t.Fatal(err)
}
if _, err := buildImageFromContext(name, ctx, true); err != nil {
t.Fatal(err)
}

deleteImages("testcopyimg")

logDone("build - copy directory contents to root")
}

Expand Down

0 comments on commit 832618a

Please sign in to comment.