From 9294e969b0b7ace79e130d674b26f09eb5ec86ef Mon Sep 17 00:00:00 2001
From: wxiaoguang <wxiaoguang@gmail.com>
Date: Sat, 25 Apr 2026 20:38:51 +0800
Subject: [PATCH] fix test

---
 models/migrations/base/tests.go | 4 ++--
 modules/setting/testenv.go      | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/models/migrations/base/tests.go b/models/migrations/base/tests.go
index c3183061928..7482829f1f2 100644
--- a/models/migrations/base/tests.go
+++ b/models/migrations/base/tests.go
@@ -75,7 +75,7 @@ func deleteDB() error {
 		}
 		db.Close()
 
-		// Check if we need to setup a specific schema
+		// Check if we need to set up a specific schema
 		if len(setting.Database.Schema) != 0 {
 			db, err = sql.Open("postgres", fmt.Sprintf("postgres://%s:%s@%s/%s?sslmode=%s",
 				setting.Database.User, setting.Database.Passwd, setting.Database.Host, setting.Database.Name, setting.Database.SSLMode))
@@ -167,7 +167,7 @@ func PrepareTestEnv(t *testing.T, skip int, syncModels ...any) (*xorm.Engine, fu
 		}
 	}
 
-	fixturesDir := filepath.Join(filepath.Dir(setting.AppPath), "models", "migrations", "fixtures", t.Name())
+	fixturesDir := filepath.Join(giteaRoot, "models", "migrations", "fixtures", t.Name())
 
 	if _, err := os.Stat(fixturesDir); err == nil {
 		t.Logf("initializing fixtures from: %s", fixturesDir)
diff --git a/modules/setting/testenv.go b/modules/setting/testenv.go
index 2e9d786b036..c81b51fd71d 100644
--- a/modules/setting/testenv.go
+++ b/modules/setting/testenv.go
@@ -64,8 +64,9 @@ func SetupGiteaTestEnv() {
 			CustomConf = customConfBuiltin
 			_ = os.Remove(CustomConf)
 		} else {
-			// CustomConf must be absolute path to make tests pass,
-			CustomConf = filepath.Join(AppWorkPath, giteaConf)
+			// CustomConf must be absolute path to make tests pass.
+			// At the moment, GITEA_TEST_CONF is always in Gitea's source root
+			CustomConf = filepath.Join(*giteaTestSourceRoot, giteaConf)
 		}
 		return giteaConf
 	}