Skip to content

Commit

Permalink
Rewrite TestBuildCopySingleFileToRoot 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 e45c921 commit 83c5dce
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 27 deletions.

This file was deleted.

34 changes: 16 additions & 18 deletions integration-cli/docker_cli_build_test.go
Expand Up @@ -636,28 +636,26 @@ ADD . /`,
}

func TestBuildCopySingleFileToRoot(t *testing.T) {
testDirName := "SingleFileToRoot"
sourceDirectory := filepath.Join(workingDirectory, "build_tests", "TestCopy", testDirName)
buildDirectory, err := ioutil.TempDir("", "test-build-add")
defer os.RemoveAll(buildDirectory)

err = copyWithCP(sourceDirectory, buildDirectory)
if err != nil {
t.Fatalf("failed to copy files to temporary directory: %s", err)
}

buildDirectory = filepath.Join(buildDirectory, testDirName)
f, err := os.OpenFile(filepath.Join(buildDirectory, "test_file"), os.O_CREATE, 0644)
name := "testcopysinglefiletoroot"
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_file /
RUN [ $(ls -l /test_file | awk '{print $3":"$4}') = 'root:root' ]
RUN [ $(ls -l /test_file | awk '{print $1}') = '-rw-r--r--' ]
RUN [ $(ls -l /exists | awk '{print $3":"$4}') = 'dockerio:dockerio' ]`,
map[string]string{
"test_file": "test1",
})
if err != nil {
t.Fatal(err)
}
f.Close()
if out, _, err := dockerCmdInDir(t, buildDirectory, "build", "-t", "testcopyimg", "."); err != nil {
t.Fatalf("build failed to complete: %s, %v", out, err)
if _, err := buildImageFromContext(name, ctx, true); err != nil {
t.Fatal(err)
}

deleteImages("testcopyimg")

logDone("build - copy single file to root")
}

Expand Down

0 comments on commit 83c5dce

Please sign in to comment.