Fix test

Author: lunny

modules/git/repo_base_nogogit.go

@@ -74,7 +74,9 @@ func (repo *Repository) CatFileBatch(ctx context.Context) (*BatchCatFile, func()
 		}, nil
 	}
 
-	setting.PanicInDevOrTesting("Opening temporary cat file batch for: %s", repo.Path)
+	if !setting.DisableTempCatFileBatchCheck {
+		setting.PanicInDevOrTesting("Opening temporary cat file batch for: %s", repo.Path)
+	}
 	tempBatch, err := NewBatchCatFile(ctx, repo.Path, false)
 	if err != nil {
 		return nil, nil, err

modules/setting/git.go

@@ -11,6 +11,9 @@ import (
 	"code.gitea.io/gitea/modules/log"
 )
 
+// DisableTempCatFileBatchCheck disables the temporary cat-file batch check
+var DisableTempCatFileBatchCheck = false
+
 // Git settings
 var Git = struct {
 	Path                 string

tests/integration/git_misc_test.go

@@ -18,12 +18,18 @@ import (
 	user_model "code.gitea.io/gitea/models/user"
 	"code.gitea.io/gitea/modules/git"
 	"code.gitea.io/gitea/modules/gitrepo"
+	"code.gitea.io/gitea/modules/setting"
+	"code.gitea.io/gitea/modules/test"
 	files_service "code.gitea.io/gitea/services/repository/files"
 
 	"github.com/stretchr/testify/assert"
 )
 
 func TestDataAsyncDoubleRead_Issue29101(t *testing.T) {
+	// in this test, we will have two parallel readers reading the same blob
+	// So we need to ignore the temporary CatFileBranch checking to make the test pass
+	defer test.MockVariableValue(&setting.DisableTempCatFileBatchCheck, true)
+
 	onGiteaRun(t, func(t *testing.T, u *url.URL) {
 		user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
 		repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})