Skip to content

Commit

Permalink
Rewrite TestAddSingleFileToNonExistDir 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 Sep 23, 2014
1 parent 6bb44b6 commit 139b6ed
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 19 deletions.

This file was deleted.

Empty file.
29 changes: 19 additions & 10 deletions integration-cli/docker_cli_build_test.go
Expand Up @@ -198,17 +198,26 @@ func TestBuildCopyMultipleFilesToFile(t *testing.T) {
}

func TestBuildAddSingleFileToNonExistDir(t *testing.T) {
buildDirectory := filepath.Join(workingDirectory, "build_tests", "TestAdd")
out, exitCode, err := dockerCmdInDir(t, buildDirectory, "build", "-t", "testaddimg", "SingleFileToNonExistDir")
errorOut(err, t, fmt.Sprintf("build failed to complete: %v %v", out, err))

if err != nil || exitCode != 0 {
t.Fatal("failed to build the image")
name := "testaddsinglefiletononexistdir"
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
ADD test_file /test_dir/
RUN [ $(ls -l / | grep test_dir | awk '{print $3":"$4}') = 'root:root' ]
RUN [ $(ls -l /test_dir/test_file | awk '{print $3":"$4}') = 'root:root' ]
RUN [ $(ls -l /exists | 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("testaddimg")

logDone("build - add single file to non-existing dir")
}

func TestBuildAddDirContentToRoot(t *testing.T) {
Expand Down

0 comments on commit 139b6ed

Please sign in to comment.