fix more tests

Author: wxiaoguang

modules/git/repo_base_nogogit.go

@@ -75,6 +75,7 @@ func (repo *Repository) CatFileBatch(ctx context.Context) (_ CatFileBatch, close
 	if repo.catFileBatchCloser == nil {
 		repo.catFileBatchCloser, err = NewBatch(ctx, repo.Path)
 		if err != nil {
+			repo.catFileBatchCloser = nil // otherwise it is "interface(nil)" and will cause wrong logic
 			return nil, nil, err
 		}
 	}
@@ -100,6 +101,8 @@ func (repo *Repository) Close() error {
 	if repo == nil {
 		return nil
 	}
+	repo.mu.Lock()
+	defer repo.mu.Unlock()
 	if repo.catFileBatchCloser != nil {
 		repo.catFileBatchCloser.Close()
 		repo.catFileBatchCloser = nil

modules/git/repo_base_test.go

@@ -0,0 +1,24 @@
+// Copyright 2026 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package git
+
+import (
+	"path/filepath"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestRepoCatFileBatch(t *testing.T) {
+	t.Run("MissingRepoAndClose", func(t *testing.T) {
+		repo, err := OpenRepository(t.Context(), filepath.Join(testReposDir, "repo1_bare"))
+		require.NoError(t, err)
+		repo.Path = "/no-such" // when the repo is missing (it usually occurs during testing because the fixtures are synced frequently)
+		_, _, err = repo.CatFileBatch(t.Context())
+		require.Error(t, err)
+		require.NoError(t, repo.Close()) // shouldn't panic
+	})
+
+	// TODO: test more methods and concurrency queries
+}

modules/graceful/manager.go

@@ -74,12 +74,6 @@ func (g *Manager) RunWithCancel(rc RunCanceler) {
 	g.RunAtShutdown(context.Background(), rc.Cancel)
 	g.runningServerWaitGroup.Add(1)
 	defer g.runningServerWaitGroup.Done()
-	defer func() {
-		if err := recover(); err != nil {
-			log.Critical("PANIC during RunWithCancel: %v\nStacktrace: %s", err, log.Stack(2))
-			g.doShutdown()
-		}
-	}()
 	rc.Run()
 }
 
@@ -89,12 +83,6 @@ func (g *Manager) RunWithCancel(rc RunCanceler) {
 func (g *Manager) RunWithShutdownContext(run func(context.Context)) {
 	g.runningServerWaitGroup.Add(1)
 	defer g.runningServerWaitGroup.Done()
-	defer func() {
-		if err := recover(); err != nil {
-			log.Critical("PANIC during RunWithShutdownContext: %v\nStacktrace: %s", err, log.Stack(2))
-			g.doShutdown()
-		}
-	}()
 	ctx := g.ShutdownContext()
 	pprof.SetGoroutineLabels(ctx) // We don't have a label to restore back to but I think this is fine
 	run(ctx)

modules/testlogger/testlogger.go

@@ -4,6 +4,7 @@
 package testlogger
 
 import (
+	"context"
 	"fmt"
 	"os"
 	"runtime"
@@ -108,30 +109,33 @@ func PrintCurrentTest(t testing.TB, skip ...int) func() {
 	actualSkip := util.OptionalArg(skip) + 1
 	_, filename, line, _ := runtime.Caller(actualSkip)
 
+	getRuntimeStackAll := func() string {
+		stack := make([]byte, 1024*1024)
+		n := runtime.Stack(stack, true)
+		return util.UnsafeBytesToString(stack[:n])
+	}
+
+	deferHasRun := false
+	t.Cleanup(func() {
+		Printf("--- %s (%s:%d) Cleanup\n", log.NewColoredValue(t.Name()), strings.TrimPrefix(filename, prefix), line)
+		if !deferHasRun {
+			Printf("!!! defer function hasn't been run but Cleanup is called\n%s", getRuntimeStackAll())
+		}
+	})
 	Printf("=== %s (%s:%d)\n", log.NewColoredValue(t.Name()), strings.TrimPrefix(filename, prefix), line)
 
 	WriterCloser.pushT(t)
 	timeoutChecker := time.AfterFunc(TestTimeout, func() {
-		l := 128 * 1024
-		var stack []byte
-		for {
-			stack = make([]byte, l)
-			n := runtime.Stack(stack, true)
-			if n <= l {
-				stack = stack[:n]
-				break
-			}
-			l = n
-		}
-		Printf("!!! %s ... timeout: %v ... stacktrace:\n%s\n\n", log.NewColoredValue(t.Name(), log.Bold, log.FgRed), TestTimeout, string(stack))
+		Printf("!!! %s ... timeout: %v ... stacktrace:\n%s\n\n", log.NewColoredValue(t.Name(), log.Bold, log.FgRed), TestTimeout, getRuntimeStackAll())
 	})
 	return func() {
+		deferHasRun = true
 		flushStart := time.Now()
 		slowFlushChecker := time.AfterFunc(TestSlowFlush, func() {
 			Printf("+++ %s ... still flushing after %v ...\n", log.NewColoredValue(t.Name(), log.Bold, log.FgRed), TestSlowFlush)
 		})
 		if err := queue.GetManager().FlushAll(t.Context(), -1); err != nil {
-			t.Errorf("Flushing queues failed with error %v", err)
+			t.Errorf("Flushing queues failed with error %q, cause %q", err, context.Cause(t.Context()))
 		}
 		slowFlushChecker.Stop()
 		timeoutChecker.Stop()