test

Author: wxiaoguang

.github/workflows/pull-db-tests.yml

@@ -41,7 +41,7 @@ jobs:
         env:
           TAGS: bindata
       - name: run tests
-        run: make test-mssql
+        run: TEST_LOGGER=console,test,file make test-mssql
         timeout-minutes: 50
         env:
           TAGS: bindata
@@ -77,7 +77,7 @@ jobs:
         env:
           TAGS: bindata
       - name: run tests
-        run: make test-mssql
+        run: TEST_LOGGER=console,test,file make test-mssql
         timeout-minutes: 50
         env:
           TAGS: bindata
@@ -109,7 +109,7 @@ jobs:
       - name: Add hosts to /etc/hosts
         run: '[ -e "/.dockerenv" ] || [ -e "/run/.containerenv" ] || echo "127.0.0.1 mssql devstoreaccount1.azurite.local" | sudo tee -a /etc/hosts'
       - run: make deps-backend
-      - run: make backend
+      - run: TEST_LOGGER=console,test,file make backend
         env:
           TAGS: bindata
       - name: run tests

Makefile

@@ -581,7 +581,7 @@ generate-ini-mssql:
 
 .PHONY: test-mssql
 test-mssql: integrations.mssql.test generate-ini-mssql
-	GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/mssql.ini ./integrations.mssql.test
+	GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/mssql.ini ./integrations.mssql.test -test.v
 
 .PHONY: test-mssql\#%
 test-mssql\#%: integrations.mssql.test generate-ini-mssql

services/automerge/automerge.go

@@ -188,7 +188,7 @@ func handlePullRequestAutoMerge(pullID int64, sha string) {
 	}
 	defer baseGitRepo.Close()
 
-	headCommitID, err := baseGitRepo.GetRefCommitIDNew(pr.GetGitHeadRefName())
+	headCommitID, err := baseGitRepo.GetRefCommitIDOld(pr.GetGitHeadRefName())
 	if err != nil {
 		log.Error("GetRefCommitID: %v", err)
 		return

services/automergequeue/automergequeue.go

@@ -40,7 +40,7 @@ func StartPRCheckAndAutoMerge(ctx context.Context, pull *issues_model.PullReques
 		return
 	}
 	defer gitRepo.Close()
-	commitID, err := gitRepo.GetRefCommitIDNew(pull.GetGitHeadRefName())
+	commitID, err := gitRepo.GetRefCommitIDOld(pull.GetGitHeadRefName())
 	if err != nil {
 		log.Error("GetRefCommitID: %v", err)
 		return

services/mailer/incoming/incoming_handler.go

@@ -127,7 +127,7 @@ func (h *ReplyHandler) Handle(ctx context.Context, content *MailContent, doer *u
 			_, err := pull_service.CreateCodeComment(
 				ctx,
 				doer,
-				nil,
+				nil, // FIXME: INCOMING-MAIL-GIT-REPO: it doesn't seem right to use nil for git repo
 				issue,
 				comment.Line,
 				content.Content,

services/pull/pull.go

@@ -805,7 +805,7 @@ func GetSquashMergeCommitMessages(ctx context.Context, pr *issues_model.PullRequ
 	if pr.Flow == issues_model.PullRequestFlowGithub {
 		headCommit, err = gitRepo.GetBranchCommit(pr.HeadBranch)
 	} else {
-		pr.HeadCommitID, err = gitRepo.GetRefCommitIDNew(pr.GetGitHeadRefName())
+		pr.HeadCommitID, err = gitRepo.GetRefCommitIDOld(pr.GetGitHeadRefName())
 		if err != nil {
 			log.Error("Unable to get head commit: %s Error: %v", pr.GetGitHeadRefName(), err)
 			return ""
@@ -982,7 +982,7 @@ func GetIssuesAllCommitStatus(ctx context.Context, issues issues_model.IssueList
 
 // getAllCommitStatus get pr's commit statuses.
 func getAllCommitStatus(ctx context.Context, gitRepo *git.Repository, pr *issues_model.PullRequest) (statuses []*git_model.CommitStatus, lastStatus *git_model.CommitStatus, err error) {
-	sha, shaErr := gitRepo.GetRefCommitIDNew(pr.GetGitHeadRefName())
+	sha, shaErr := gitRepo.GetRefCommitIDOld(pr.GetGitHeadRefName())
 	if shaErr != nil {
 		return nil, nil, shaErr
 	}
@@ -1032,7 +1032,7 @@ func IsHeadEqualWithBranch(ctx context.Context, pr *issues_model.PullRequest, br
 			return false, err
 		}
 	} else {
-		pr.HeadCommitID, err = baseGitRepo.GetRefCommitIDNew(pr.GetGitHeadRefName())
+		pr.HeadCommitID, err = baseGitRepo.GetRefCommitIDOld(pr.GetGitHeadRefName())
 		if err != nil {
 			return false, err
 		}

services/pull/review.go

@@ -259,7 +259,7 @@ func createCodeComment(ctx context.Context, doer *user_model.User, repo *repo_mo
 
 	// Only fetch diff if comment is review comment
 	if len(patch) == 0 && reviewID != 0 {
-		headCommitID, err := gitRepo.GetRefCommitIDNew(pr.GetGitHeadRefName())
+		headCommitID, err := gitRepo.GetRefCommitIDOld(pr.GetGitHeadRefName())
 		if err != nil {
 			return nil, fmt.Errorf("GetRefCommitID[%s]: %w", pr.GetGitHeadRefName(), err)
 		}
@@ -325,7 +325,8 @@ func SubmitReview(ctx context.Context, doer *user_model.User, gitRepo *git.Repos
 			return nil, nil, ErrSubmitReviewOnClosedPR
 		}
 
-		headCommitID, err := gitRepo.GetRefCommitIDNew(pr.GetGitHeadRefName())
+		// FIXME: INCOMING-MAIL-GIT-REPO: the gitRepo can be nil when it is from incoming mail
+		headCommitID, err := gitRepo.GetRefCommitIDOld(pr.GetGitHeadRefName())
 		if err != nil {
 			return nil, nil, err
 		}

services/repository/branch.go

@@ -230,7 +230,7 @@ func loadOneBranch(ctx context.Context, repo *repo_model.Repository, dbBranch *g
 					return nil, fmt.Errorf("OpenRepository: %v", err)
 				}
 				defer baseGitRepo.Close()
-				repoIDToGitRepo[pr.BaseRepoID] = baseGitRepo
+				repoIDToGitRepo[pr.BaseRepoID] = baseGitRepo // FIXME: it's not right to update the caller's map and inserted a closed git repo into it
 			}
 			pullCommit, err := baseGitRepo.GetRefCommitIDNew(pr.GetGitHeadRefName())
 			if err != nil && !git.IsErrNotExist(err) {