test

Author: wxiaoguang

modules/git/repo_base_nogogit.go

@@ -9,7 +9,6 @@ package git
 import (
 	"context"
 	"path/filepath"
-	"sync"
 
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/util"
@@ -25,7 +24,6 @@ type Repository struct {
 
 	gpgSettings *GPGSettings
 
-	mu                 sync.Mutex
 	catFileBatchCloser CatFileBatchCloser
 	catFileBatchInUse  bool
 
@@ -65,9 +63,6 @@ func OpenRepository(ctx context.Context, repoPath string) (*Repository, error) {
 
 // CatFileBatch obtains a CatFileBatch for this repository
 func (repo *Repository) CatFileBatch(ctx context.Context, optAlwaysNewBatch ...bool) (_ CatFileBatch, closeFunc func(), err error) {
-	repo.mu.Lock()
-	defer repo.mu.Unlock()
-
 	if util.OptionalArg(optAlwaysNewBatch) {
 		b, err := NewBatch(ctx, repo.Path)
 		return b, b.Close, err
@@ -83,8 +78,6 @@ func (repo *Repository) CatFileBatch(ctx context.Context, optAlwaysNewBatch ...b
 	if !repo.catFileBatchInUse {
 		repo.catFileBatchInUse = true
 		return CatFileBatch(repo.catFileBatchCloser), func() {
-			repo.mu.Lock()
-			defer repo.mu.Unlock()
 			repo.catFileBatchInUse = false
 		}, nil
 	}

modules/git/repo_commit_nogogit.go

@@ -36,7 +36,7 @@ func (repo *Repository) ResolveReference(name string) (string, error) {
 
 // GetRefCommitID returns the last commit ID string of given reference (branch or tag).
 func (repo *Repository) GetRefCommitID(name string) (string, error) {
-	batch, cancel, err := repo.CatFileBatch(repo.Ctx, true)
+	batch, cancel, err := repo.CatFileBatch(repo.Ctx, true) // here is the real fatal point?
 	if err != nil {
 		return "", err
 	}

tests/integration/repo_commits_test.go

@@ -193,6 +193,7 @@ func TestRepoCommitsStatusParallel(t *testing.T) {
 		wg.Add(1)
 		go func(parentT *testing.T, i int) {
 			parentT.Run(fmt.Sprintf("ParallelCreateStatus_%d", i), func(t *testing.T) {
+				defer wg.Done()
 				ctx := NewAPITestContext(t, "user2", "repo1", auth_model.AccessTokenScopeWriteRepository)
 				runBody := doAPICreateCommitStatus(ctx, path.Base(commitURL), api.CreateStatusOption{
 					State:       commitstatus.CommitStatusPending,
@@ -201,7 +202,6 @@ func TestRepoCommitsStatusParallel(t *testing.T) {
 					Context:     "testci",
 				})
 				runBody(t)
-				wg.Done()
 			})
 		}(t, i)
 	}