Skip to content

Commit

Permalink
Rewrite TestBuildCopySingleFileToExistDir 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 d41cba6 commit 2248109
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 16 deletions.

This file was deleted.

Empty file.
26 changes: 20 additions & 6 deletions integration-cli/docker_cli_build_test.go
Expand Up @@ -687,13 +687,27 @@ COPY test_file .`,
}

func TestBuildCopySingleFileToExistDir(t *testing.T) {
buildDirectory := filepath.Join(workingDirectory, "build_tests", "TestCopy")
if out, _, err := dockerCmdInDir(t, buildDirectory, "build", "-t", "testcopyimg", "SingleFileToExistDir"); err != nil {
t.Fatalf("build failed to complete: %s, %v", out, err)
name := "testcopysinglefiletoexistdir"
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 mkdir /exists
RUN touch /exists/exists_file
RUN chown -R dockerio.dockerio /exists
COPY test_file /exists/
RUN [ $(ls -l / | grep exists | awk '{print $3":"$4}') = 'dockerio:dockerio' ]
RUN [ $(ls -l /exists/test_file | awk '{print $3":"$4}') = 'root:root' ]
RUN [ $(ls -l /exists/exists_file | awk '{print $3":"$4}') = 'dockerio:dockerio' ]`,
map[string]string{
"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 single file to existing dir")
}

Expand Down

0 comments on commit 2248109

Please sign in to comment.