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

Resolving comments

This commit is contained in:
Don McCasland 2019-10-08 12:19:20 -07:00
parent e5da55d4cd
commit 27020f23b9
No known key found for this signature in database
GPG Key ID: 2B332A542CE5FE1B
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/commands/copy_test.go
View File

@ -52,8 +52,7 @@ func setupTestTemp() string {
if err != nil { if err != nil {
logrus.Fatalf("error creating temp dir %s", err) logrus.Fatalf("error creating temp dir %s", err)
} }
//defer os.RemoveAll(tempDir) logrus.Debugf("Tempdir: %s", tempDir)
logrus.Infof("Tempdir: %s", tempDir)
srcPath, err := filepath.Abs("../../integration/context") srcPath, err := filepath.Abs("../../integration/context")
if err != nil { if err != nil {
@ -101,6 +100,7 @@ func setupTestTemp() string {
} }
func TestCopyExecuteCmd(t *testing.T) { func TestCopyExecuteCmd(t *testing.T) {
tempDir := setupTestTemp() tempDir := setupTestTemp()
defer os.RemoveAll(tempDir)
cfg := &v1.Config{ cfg := &v1.Config{
Cmd: nil, Cmd: nil,
@ -121,7 +121,6 @@ func TestCopyExecuteCmd(t *testing.T) {
buildArgs := copySetUpBuildArgs() buildArgs := copySetUpBuildArgs()
dest := cfg.WorkingDir + "/" + test.sourcesAndDest[len(test.sourcesAndDest)-1] dest := cfg.WorkingDir + "/" + test.sourcesAndDest[len(test.sourcesAndDest)-1]
logrus.Infof("dest dir: %s", dest)
err := cmd.ExecuteCommand(cfg, buildArgs) err := cmd.ExecuteCommand(cfg, buildArgs)
if err != nil { if err != nil {
@ -143,7 +142,7 @@ func TestCopyExecuteCmd(t *testing.T) {
t.Error() t.Error()
} }
for _, file := range files { for _, file := range files {
logrus.Infof("file: %v", file.Name()) logrus.Debugf("file: %v", file.Name())
dirList = append(dirList, file.Name()) dirList = append(dirList, file.Name())
} }
} else { } else {

2
pkg/util/fs_util.go
View File

@ -192,7 +192,7 @@ func extractFile(dest string, hdr *tar.Header, tr io.Reader) error {
// or a file was copied over a directory prior to now // or a file was copied over a directory prior to now
fi, err := os.Stat(dir) fi, err := os.Stat(dir)
if os.IsNotExist(err) || !fi.IsDir() { if os.IsNotExist(err) || !fi.IsDir() {
logrus.Infof("base %s for file %s does not exist. Creating.", base, path) logrus.Debugf("base %s for file %s does not exist. Creating.", base, path)
if err := os.MkdirAll(dir, 0755); err != nil { if err := os.MkdirAll(dir, 0755); err != nil {
return err return err
} }