fix path handling

Author: wxiaoguang

models/migrations/base/tests.go

@@ -8,7 +8,6 @@ import (
 	"context"
 	"fmt"
 	"os"
-	"path"
 	"path/filepath"
 	"runtime"
 	"testing"
@@ -35,7 +34,7 @@ func PrepareTestEnv(t *testing.T, skip int, syncModels ...any) (*xorm.Engine, fu
 	ourSkip := 2
 	ourSkip += skip
 	deferFn := testlogger.PrintCurrentTest(t, ourSkip)
-	assert.NoError(t, unittest.SyncDirs(path.Join(filepath.Dir(setting.AppPath), "tests/gitea-repositories-meta"), setting.RepoRootPath))
+	assert.NoError(t, unittest.SyncDirs(filepath.Join(filepath.Dir(setting.AppPath), "tests/gitea-repositories-meta"), setting.RepoRootPath))
 	ownerDirs, err := os.ReadDir(setting.RepoRootPath)
 	if err != nil {
 		assert.NoError(t, err, "unable to read the new repo root: %v\n", err)
@@ -122,20 +121,20 @@ func MainTest(m *testing.M) {
 	if runtime.GOOS == "windows" {
 		giteaBinary += ".exe"
 	}
-	setting.AppPath = path.Join(giteaRoot, giteaBinary)
+	setting.AppPath = filepath.Join(giteaRoot, giteaBinary)
 	if _, err := os.Stat(setting.AppPath); err != nil {
 		fmt.Printf("Could not find gitea binary at %s\n", setting.AppPath)
 		os.Exit(1)
 	}
 
 	giteaConf := os.Getenv("GITEA_CONF")
 	if giteaConf == "" {
-		giteaConf = path.Join(filepath.Dir(setting.AppPath), "tests/sqlite.ini")
+		giteaConf = filepath.Join(filepath.Dir(setting.AppPath), "tests/sqlite.ini")
 		fmt.Printf("Environment variable $GITEA_CONF not set - defaulting to %s\n", giteaConf)
 	}
 
-	if !path.IsAbs(giteaConf) {
-		setting.CustomConf = path.Join(giteaRoot, giteaConf)
+	if !filepath.IsAbs(giteaConf) {
+		setting.CustomConf = filepath.Join(giteaRoot, giteaConf)
 	} else {
 		setting.CustomConf = giteaConf
 	}

models/unittest/fscopy.go

@@ -4,9 +4,8 @@
 package unittest
 
 import (
-	"io"
 	"os"
-	"path"
+	"path/filepath"
 	"strings"
 
 	"code.gitea.io/gitea/modules/util"
@@ -31,27 +30,7 @@ func Copy(src, dest string) error {
 		return os.Symlink(target, dest)
 	}
 
-	sr, err := os.Open(src)
-	if err != nil {
-		return err
-	}
-	defer sr.Close()
-
-	dw, err := os.Create(dest)
-	if err != nil {
-		return err
-	}
-	defer dw.Close()
-
-	if _, err = io.Copy(dw, sr); err != nil {
-		return err
-	}
-
-	// Set back file information.
-	if err = os.Chtimes(dest, si.ModTime(), si.ModTime()); err != nil {
-		return err
-	}
-	return os.Chmod(dest, si.Mode())
+	return util.CopyFile(src, dest)
 }
 
 // Sync synchronizes the two files. This is skipped if both files
@@ -89,18 +68,17 @@ func SyncDirs(srcPath, destPath string) error {
 	}
 
 	// find and delete all untracked files
-	infos, err := util.StatDir(destPath, true)
+	files, err := util.StatDir(destPath, true)
 	if err != nil {
 		return err
 	}
 
-	for _, info := range infos {
-		curPath := path.Join(destPath, info)
-
-		if _, err := os.Stat(path.Join(srcPath, info)); err != nil {
+	for _, file := range files {
+		destFilePath := filepath.Join(destPath, file)
+		if _, err = os.Stat(filepath.Join(srcPath, file)); err != nil {
 			if os.IsNotExist(err) {
-				// Delete
-				if err := os.RemoveAll(curPath); err != nil {
+				// TODO: why delete? it should happen because the file list is just queried above, why not exist?
+				if err := os.RemoveAll(destFilePath); err != nil {
 					return err
 				}
 			} else {
@@ -110,17 +88,17 @@ func SyncDirs(srcPath, destPath string) error {
 	}
 
 	// Gather directory info.
-	infos, err = util.StatDir(srcPath, true)
+	files, err = util.StatDir(srcPath, true)
 	if err != nil {
 		return err
 	}
 
-	for _, info := range infos {
-		curPath := path.Join(destPath, info)
-		if strings.HasSuffix(info, "/") {
-			err = os.MkdirAll(curPath, os.ModePerm)
+	for _, file := range files {
+		destFilePath := filepath.Join(destPath, file)
+		if strings.HasSuffix(file, "/") {
+			err = os.MkdirAll(destFilePath, os.ModePerm)
 		} else {
-			err = Sync(path.Join(srcPath, info), curPath)
+			err = Sync(filepath.Join(srcPath, file), destFilePath)
 		}
 		if err != nil {
 			return err