fix: make sources.dstFile create parent dirs

Clean up all the unit tests that were creating the target dir in order to pass. Fixes: Issue #173
retr0h · Mar 14, 2024 · 462e16b · 462e16b
1 parent 71cff17
commit 462e16b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 24 deletions.
diff --git a/internal/repository/copy.go b/internal/repository/copy.go
@@ -70,6 +70,7 @@ func (r *Copy) CopyFile(
 
 	// Open dest file for writing; make it owner-only perms before putting
 	// anything in it
+	_ = r.appFs.MkdirAll(r.appFs.Dir(dst), si.Mode())
 	out, err := r.appFs.Create(dst)
 	if err != nil {
 		return err

diff --git a/internal/repository/copy_public_test.go b/internal/repository/copy_public_test.go
@@ -67,10 +67,6 @@ func (suite *CopyPublicTestSuite) TestCopyFileOk() {
 			srcDir:  suite.appFs.Join(suite.cloneDir, "srcDir"),
 			srcFile: suite.appFs.Join(suite.cloneDir, "srcDir", "1.txt"),
 		},
-		{
-			appFs:  suite.appFs,
-			srcDir: suite.dstDir,
-		},
 	}
 	createFileSpecs(specs)
 
@@ -100,10 +96,6 @@ func (suite *CopyPublicTestSuite) TestCopyFileErrorStat() {
 			srcDir:  suite.appFs.Join(suite.cloneDir, "srcDir"),
 			srcFile: suite.appFs.Join(suite.cloneDir, "srcDir", "1.txt"),
 		},
-		{
-			appFs:  suite.appFs,
-			srcDir: suite.dstDir,
-		},
 	}
 	createFileSpecs(specs)
 	// Make Stat() calls fail
@@ -145,10 +137,6 @@ func (suite *CopyPublicTestSuite) TestCopyFileErrorSettingDestfilePerms() {
 			srcDir:  suite.appFs.Join(suite.cloneDir, "srcDir"),
 			srcFile: suite.appFs.Join(suite.cloneDir, "srcDir", "1.txt"),
 		},
-		{
-			appFs:  suite.appFs,
-			srcDir: suite.dstDir,
-		},
 	}
 	createFileSpecs(specs)
 	// Make Chmod() calls fail
@@ -180,10 +168,6 @@ func (suite *CopyPublicTestSuite) TestCopyFileErrorCopy() {
 			srcDir:  suite.appFs.Join(suite.cloneDir, "srcDir"),
 			srcFile: suite.appFs.Join(suite.cloneDir, "srcDir", "1.txt"),
 		},
-		{
-			appFs:  suite.appFs,
-			srcDir: suite.dstDir,
-		},
 	}
 	createFileSpecs(specs)
 	assertFile := suite.appFs.Join(suite.dstDir, "1.txt")
@@ -199,10 +183,6 @@ func (suite *CopyPublicTestSuite) TestCopyFileErrorSync() {
 			srcDir:  suite.appFs.Join(suite.cloneDir, "srcDir"),
 			srcFile: suite.appFs.Join(suite.cloneDir, "srcDir", "1.txt"),
 		},
-		{
-			appFs:  suite.appFs,
-			srcDir: suite.dstDir,
-		},
 	}
 	createFileSpecs(specs)
 	// Make Sync() calls fail
@@ -226,10 +206,6 @@ func (suite *CopyPublicTestSuite) TestCopyFileErrorFinalizingDestfilePerms() {
 			srcDir:  suite.appFs.Join(suite.cloneDir, "srcDir"),
 			srcFile: suite.appFs.Join(suite.cloneDir, "srcDir", "1.txt"),
 		},
-		{
-			appFs:  suite.appFs,
-			srcDir: suite.dstDir,
-		},
 	}
 	createFileSpecs(specs)
 	// Make the second Chmod() call fail