try to fix tests

go-gitea · Jun 10, 2022 · e8fad37 · e8fad37
1 parent 5e8c6b4
commit e8fad37
Show file tree

Hide file tree

Showing 4 changed files with 80 additions and 69 deletions.
diff --git a/modules/git/git.go b/modules/git/git.go
@@ -10,6 +10,7 @@ import (
 	"fmt"
 	"os"
 	"os/exec"
+	"path/filepath"
 	"runtime"
 	"strings"
 	"sync"
@@ -139,8 +140,12 @@ func InitSimple(ctx context.Context) error {
 // HomeDir is the home dir for git to store the global config file used by Gitea internally
 func HomeDir() string {
 	if setting.RepoRootPath == "" {
-		log.Fatal("Can not get Git's HomeDir (RepoRootPath is empty), the setting and git modules are not initialized correctly")
-		return ""
+		// TODO: now, some unit test code call the git module directly without initialization, which is incorrect.
+		// at the moment, we just use a temp HomeDir to prevent from conflicting with user's git config
+		// in the future, the git module should be initialized first before use.
+		tmpHomeDir := filepath.Join(os.TempDir(), "gitea-temp-home")
+		log.Error("Git's HomeDir is empty (RepoRootPath is empty), the git module is not initialized correctly, using a temp HomeDir (%s) temporarily", tmpHomeDir)
+		return tmpHomeDir
 	}
 	return setting.RepoRootPath
 }

diff --git a/modules/git/repo_language_stats_gogit.go b/modules/git/repo_language_stats_gogit.go
@@ -45,28 +45,30 @@ func (repo *Repository) GetLanguageStats(commitID string) (map[string]int64, err
 
 	var checker *CheckAttributeReader
 
-	indexFilename, workTree, deleteTemporaryFile, err := repo.ReadTreeToTemporaryIndex(commitID)
-	if err == nil {
-		defer deleteTemporaryFile()
-		checker = &CheckAttributeReader{
-			Attributes: []string{"linguist-vendored", "linguist-generated", "linguist-language", "gitlab-language"},
-			Repo:       repo,
-			IndexFile:  indexFilename,
-			WorkTree:   workTree,
-		}
-		ctx, cancel := context.WithCancel(DefaultContext)
-		if err := checker.Init(ctx); err != nil {
-			log.Error("Unable to open checker for %s. Error: %v", commitID, err)
-		} else {
-			go func() {
-				err = checker.Run()
-				if err != nil {
-					log.Error("Unable to open checker for %s. Error: %v", commitID, err)
-					cancel()
-				}
-			}()
+	{
+		indexFilename, workTree, deleteTemporaryFile, err := repo.ReadTreeToTemporaryIndex(commitID)
+		if err == nil {
+			defer deleteTemporaryFile()
+			checker = &CheckAttributeReader{
+				Attributes: []string{"linguist-vendored", "linguist-generated", "linguist-language", "gitlab-language"},
+				Repo:       repo,
+				IndexFile:  indexFilename,
+				WorkTree:   workTree,
+			}
+			ctx, cancel := context.WithCancel(DefaultContext)
+			if err := checker.Init(ctx); err != nil {
+				log.Error("Unable to open checker for %s. Error: %v", commitID, err)
+			} else {
+				go func() {
+					err = checker.Run()
+					if err != nil {
+						log.Error("Unable to open checker for %s. Error: %v", commitID, err)
+						cancel()
+					}
+				}()
+			}
+			defer cancel()
 		}
-		defer cancel()
 	}
 
 	sizes := make(map[string]int64)

diff --git a/modules/git/repo_language_stats_nogogit.go b/modules/git/repo_language_stats_nogogit.go
@@ -65,31 +65,33 @@ func (repo *Repository) GetLanguageStats(commitID string) (map[string]int64, err
 
 	var checker *CheckAttributeReader
 
-	indexFilename, worktree, deleteTemporaryFile, err := repo.ReadTreeToTemporaryIndex(commitID)
-	if err == nil {
-		defer deleteTemporaryFile()
-		checker = &CheckAttributeReader{
-			Attributes: []string{"linguist-vendored", "linguist-generated", "linguist-language", "gitlab-language"},
-			Repo:       repo,
-			IndexFile:  indexFilename,
-			WorkTree:   worktree,
-		}
-		ctx, cancel := context.WithCancel(repo.Ctx)
-		if err := checker.Init(ctx); err != nil {
-			log.Error("Unable to open checker for %s. Error: %v", commitID, err)
-		} else {
-			go func() {
-				err = checker.Run()
-				if err != nil {
-					log.Error("Unable to open checker for %s. Error: %v", commitID, err)
-					cancel()
-				}
+	{
+		indexFilename, worktree, deleteTemporaryFile, err := repo.ReadTreeToTemporaryIndex(commitID)
+		if err == nil {
+			defer deleteTemporaryFile()
+			checker = &CheckAttributeReader{
+				Attributes: []string{"linguist-vendored", "linguist-generated", "linguist-language", "gitlab-language"},
+				Repo:       repo,
+				IndexFile:  indexFilename,
+				WorkTree:   worktree,
+			}
+			ctx, cancel := context.WithCancel(repo.Ctx)
+			if err := checker.Init(ctx); err != nil {
+				log.Error("Unable to open checker for %s. Error: %v", commitID, err)
+			} else {
+				go func() {
+					err = checker.Run()
+					if err != nil {
+						log.Error("Unable to open checker for %s. Error: %v", commitID, err)
+						cancel()
+					}
+				}()
+			}
+			defer func() {
+				_ = checker.Close()
+				cancel()
 			}()
 		}
-		defer func() {
-			_ = checker.Close()
-			cancel()
-		}()
 	}
 
 	contentBuf := bytes.Buffer{}

diff --git a/services/gitdiff/gitdiff.go b/services/gitdiff/gitdiff.go
@@ -1418,32 +1418,34 @@ func GetDiff(gitRepo *git.Repository, opts *DiffOptions, files ...string) (*Diff
 
 	var checker *git.CheckAttributeReader
 
-	indexFilename, worktree, deleteTemporaryFile, err := gitRepo.ReadTreeToTemporaryIndex(opts.AfterCommitID)
-	if err == nil {
-		defer deleteTemporaryFile()
-
-		checker = &git.CheckAttributeReader{
-			Attributes: []string{"linguist-vendored", "linguist-generated", "linguist-language", "gitlab-language"},
-			Repo:       gitRepo,
-			IndexFile:  indexFilename,
-			WorkTree:   worktree,
-		}
-		ctx, cancel := context.WithCancel(gitRepo.Ctx)
-		if err := checker.Init(ctx); err != nil {
-			log.Error("Unable to open checker for %s. Error: %v", opts.AfterCommitID, err)
-		} else {
-			go func() {
-				err := checker.Run()
-				if err != nil && err != ctx.Err() {
-					log.Error("Unable to open checker for %s. Error: %v", opts.AfterCommitID, err)
-				}
+	{
+		indexFilename, worktree, deleteTemporaryFile, err := gitRepo.ReadTreeToTemporaryIndex(opts.AfterCommitID)
+		if err == nil {
+			defer deleteTemporaryFile()
+
+			checker = &git.CheckAttributeReader{
+				Attributes: []string{"linguist-vendored", "linguist-generated", "linguist-language", "gitlab-language"},
+				Repo:       gitRepo,
+				IndexFile:  indexFilename,
+				WorkTree:   worktree,
+			}
+			ctx, cancel := context.WithCancel(gitRepo.Ctx)
+			if err := checker.Init(ctx); err != nil {
+				log.Error("Unable to open checker for %s. Error: %v", opts.AfterCommitID, err)
+			} else {
+				go func() {
+					err := checker.Run()
+					if err != nil && err != ctx.Err() {
+						log.Error("Unable to open checker for %s. Error: %v", opts.AfterCommitID, err)
+					}
+					cancel()
+				}()
+			}
+			defer func() {
+				_ = checker.Close()
 				cancel()
 			}()
 		}
-		defer func() {
-			_ = checker.Close()
-			cancel()
-		}()
 	}
 
 	for _, diffFile := range diff.Files {