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

modules/git/repo_commit.go

@@ -18,12 +18,12 @@ import (
 
 // GetBranchCommitID returns last commit ID string of given branch.
 func (repo *Repository) GetBranchCommitID(name string) (string, error) {
-	return repo.GetRefCommitIDOld(BranchPrefix + name)
+	return repo.GetRefCommitIDNew(BranchPrefix + name)
 }
 
 // GetTagCommitID returns last commit ID string of given tag.
 func (repo *Repository) GetTagCommitID(name string) (string, error) {
-	return repo.GetRefCommitIDOld(TagPrefix + name)
+	return repo.GetRefCommitIDNew(TagPrefix + name)
 }
 
 // GetCommit returns commit object of by ID string.

modules/git/repo_commit_test.go

@@ -124,7 +124,7 @@ func TestGetRefCommitID(t *testing.T) {
 	}
 
 	for _, testCase := range testCases {
-		commitID, err := bareRepo1.GetRefCommitIDOld(testCase.Ref)
+		commitID, err := bareRepo1.GetRefCommitIDNew(testCase.Ref)
 		if assert.NoError(t, err) {
 			assert.Equal(t, testCase.ExpectedCommitID, commitID)
 		}

modules/git/repo_compare_test.go

@@ -96,7 +96,7 @@ func TestReadWritePullHead(t *testing.T) {
 	defer repo.Close()
 
 	// Try to open non-existing Pull
-	_, err = repo.GetRefCommitIDOld(PullPrefix + "0/head")
+	_, err = repo.GetRefCommitIDNew(PullPrefix + "0/head")
 	assert.Error(t, err)
 
 	// Write a fake sha1 with only 40 zeros
@@ -111,7 +111,7 @@ func TestReadWritePullHead(t *testing.T) {
 	}
 
 	// Read the file created
-	headContents, err := repo.GetRefCommitIDOld(PullPrefix + "1/head")
+	headContents, err := repo.GetRefCommitIDNew(PullPrefix + "1/head")
 	if err != nil {
 		assert.NoError(t, err)
 		return

modules/git/repo_tree_nogogit.go

@@ -88,7 +88,7 @@ func (repo *Repository) GetTree(idStr string) (*Tree, error) {
 		return nil, err
 	}
 	if len(idStr) != objectFormat.FullLength() {
-		res, err := repo.GetRefCommitIDOld(idStr)
+		res, err := repo.GetRefCommitIDNew(idStr)
 		if err != nil {
 			return nil, err
 		}

modules/indexer/code/gitgrep/gitgrep.go

@@ -42,7 +42,7 @@ func PerformSearch(ctx context.Context, page int, repoID int64, gitRepo *git.Rep
 		// TODO: if no branch exists, it reports: exit status 128, fatal: this operation must be run in a work tree.
 		return nil, 0, fmt.Errorf("git.GrepSearch: %w", err)
 	}
-	commitID, err := gitRepo.GetRefCommitIDOld(ref.String())
+	commitID, err := gitRepo.GetRefCommitIDNew(ref.String())
 	if err != nil {
 		return nil, 0, fmt.Errorf("gitRepo.GetRefCommitID: %w", err)
 	}

routers/api/v1/repo/pull.go

@@ -1567,7 +1567,7 @@ func GetPullRequestFiles(ctx *context.APIContext) {
 		return
 	}
 
-	headCommitID, err := baseGitRepo.GetRefCommitIDOld(pr.GetGitHeadRefName())
+	headCommitID, err := baseGitRepo.GetRefCommitIDNew(pr.GetGitHeadRefName())
 	if err != nil {
 		ctx.APIErrorInternal(err)
 		return

routers/api/v1/repo/pull_review.go

@@ -336,7 +336,7 @@ func CreatePullReview(ctx *context.APIContext) {
 		}
 		defer closer.Close()
 
-		headCommitID, err := gitRepo.GetRefCommitIDOld(pr.GetGitHeadRefName())
+		headCommitID, err := gitRepo.GetRefCommitIDNew(pr.GetGitHeadRefName())
 		if err != nil {
 			ctx.APIErrorInternal(err)
 			return
@@ -455,7 +455,7 @@ func SubmitPullReview(ctx *context.APIContext) {
 		return
 	}
 
-	headCommitID, err := ctx.Repo.GitRepo.GetRefCommitIDOld(pr.GetGitHeadRefName())
+	headCommitID, err := ctx.Repo.GitRepo.GetRefCommitIDNew(pr.GetGitHeadRefName())
 	if err != nil {
 		ctx.APIErrorInternal(err)
 		return

routers/web/repo/pull.go

@@ -197,7 +197,7 @@ func GetPullDiffStats(ctx *context.Context) {
 	}
 
 	// do not report 500 server error to end users if error occurs, otherwise a PR missing ref won't be able to view.
-	headCommitID, err := ctx.Repo.GitRepo.GetRefCommitIDOld(pull.GetGitHeadRefName())
+	headCommitID, err := ctx.Repo.GitRepo.GetRefCommitIDNew(pull.GetGitHeadRefName())
 	if err != nil {
 		log.Error("Failed to GetRefCommitID: %v, repo: %v", err, ctx.Repo.Repository.FullName())
 		return
@@ -219,7 +219,7 @@ func GetMergedBaseCommitID(ctx *context.Context, issue *issues_model.Issue) stri
 	if pull.MergeBase == "" {
 		var commitSHA, parentCommit string
 		// If there is a head or a patch file, and it is readable, grab info
-		commitSHA, err := ctx.Repo.GitRepo.GetRefCommitIDOld(pull.GetGitHeadRefName())
+		commitSHA, err := ctx.Repo.GitRepo.GetRefCommitIDNew(pull.GetGitHeadRefName())
 		if err != nil {
 			// Head File does not exist, try the patch
 			commitSHA, err = ctx.Repo.GitRepo.ReadPatchCommit(pull.Index)
@@ -364,7 +364,7 @@ func prepareViewPullInfo(ctx *context.Context, issue *issues_model.Issue) *pull_
 		ctx.Data["BaseTarget"] = pull.BaseBranch
 		ctx.Data["HeadTarget"] = pull.HeadBranch
 
-		sha, err := baseGitRepo.GetRefCommitIDOld(pull.GetGitHeadRefName())
+		sha, err := baseGitRepo.GetRefCommitIDNew(pull.GetGitHeadRefName())
 		if err != nil {
 			ctx.ServerError(fmt.Sprintf("GetRefCommitID(%s)", pull.GetGitHeadRefName()), err)
 			return nil
@@ -422,7 +422,7 @@ func prepareViewPullInfo(ctx *context.Context, issue *issues_model.Issue) *pull_
 
 		if headBranchExist {
 			if pull.Flow != issues_model.PullRequestFlowGithub {
-				headBranchSha, err = baseGitRepo.GetRefCommitIDOld(pull.GetGitHeadRefName())
+				headBranchSha, err = baseGitRepo.GetRefCommitIDNew(pull.GetGitHeadRefName())
 			} else {
 				headBranchSha, err = headGitRepo.GetBranchCommitID(pull.HeadBranch)
 			}
@@ -445,7 +445,7 @@ func prepareViewPullInfo(ctx *context.Context, issue *issues_model.Issue) *pull_
 		ctx.Data["GetCommitMessages"] = ""
 	}
 
-	sha, err := baseGitRepo.GetRefCommitIDOld(pull.GetGitHeadRefName())
+	sha, err := baseGitRepo.GetRefCommitIDNew(pull.GetGitHeadRefName())
 	if err != nil {
 		if git.IsErrNotExist(err) {
 			ctx.Data["IsPullRequestBroken"] = true
@@ -702,7 +702,7 @@ func viewPullFiles(ctx *context.Context, beforeCommitID, afterCommitID string) {
 		return
 	}
 
-	headCommitID, err := gitRepo.GetRefCommitIDOld(pull.GetGitHeadRefName())
+	headCommitID, err := gitRepo.GetRefCommitIDNew(pull.GetGitHeadRefName())
 	if err != nil {
 		ctx.ServerError("GetRefCommitID", err)
 		return