public_git
/
kaniko
mirror of https://github.com/GoogleContainerTools/kaniko
1
0
Fork 0
Code Issues Releases Wiki Activity

Don't copy same files twice in copy integration tests (#273) 

* Don't copy same files twice in copy integration tests

* Use error from RunCommandWithoutTest
This commit is contained in:
Christie Wilson 2018-08-03 10:01:29 -07:00 committed by priyawadhwa
parent 954b6129d6
commit 53b5fb41d2
7 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
integration/cmd.go
View File

@ -30,7 +30,7 @@ func RunCommandWithoutTest(cmd *exec.Cmd) ([]byte, error) {
fmt.Println(cmd.Args) fmt.Println(cmd.Args)
fmt.Println(string(output)) fmt.Println(string(output))
} }
return output, nil return output, err
} }
// RunCommand will run cmd and if it fails will output relevant info for debugging // RunCommand will run cmd and if it fails will output relevant info for debugging

1
integration/context/qux/qup Normal file
View File

@ -0,0 +1 @@
qup

1
integration/context/qux/quw/que Normal file
View File

@ -0,0 +1 @@
que

1
integration/context/qux/quz Normal file
View File

@ -0,0 +1 @@
quz

2
integration/dockerfiles/Dockerfile_test_copy
View File

@ -9,7 +9,7 @@ COPY ./ dir/
COPY . newdir COPY . newdir
COPY context/bar /baz/ COPY context/bar /baz/
COPY ["context/foo", "/tmp/foo" ] COPY ["context/foo", "/tmp/foo" ]
COPY context/b* /baz/ COPY context/q* /qux/
COPY context/foo context/bar/ba? /test/ COPY context/foo context/bar/ba? /test/
COPY context/arr[[]0].txt /mydir/ COPY context/arr[[]0].txt /mydir/
COPY context/bar/bat . COPY context/bar/bat .

2
integration/dockerfiles/Dockerfile_test_copy_bucket
View File

@ -9,7 +9,7 @@ COPY ./ dir/
COPY . newdir COPY . newdir
COPY context/bar /baz/ COPY context/bar /baz/
COPY ["context/foo", "/tmp/foo" ] COPY ["context/foo", "/tmp/foo" ]
COPY context/b* /baz/ COPY context/q* /qux/
COPY context/foo context/bar/ba? /test/ COPY context/foo context/bar/ba? /test/
COPY context/arr[[]0].txt /mydir/ COPY context/arr[[]0].txt /mydir/
COPY context/bar/bat . COPY context/bar/bat .

2
integration/dockerfiles/Dockerfile_test_copy_reproducible
View File

@ -9,7 +9,7 @@ COPY ./ dir/
COPY . newdir COPY . newdir
COPY context/bar /baz/ COPY context/bar /baz/
COPY ["context/foo", "/tmp/foo" ] COPY ["context/foo", "/tmp/foo" ]
COPY context/b* /baz/ COPY context/q* /qux/
COPY context/foo context/bar/ba? /test/ COPY context/foo context/bar/ba? /test/
COPY context/arr[[]0].txt /mydir/ COPY context/arr[[]0].txt /mydir/
COPY context/bar/bat . COPY context/bar/bat .