From 11f910c80c358eb976ac794f41e64d6e3fe3d68a Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Sat, 25 Apr 2026 18:01:34 +0800 Subject: [PATCH] debug --- models/migrations/base/tests.go | 2 +- models/unittest/testdb.go | 6 +----- modules/queue/manager_test.go | 5 ----- modules/setting/server.go | 3 +++ 4 files changed, 5 insertions(+), 11 deletions(-) diff --git a/models/migrations/base/tests.go b/models/migrations/base/tests.go index 117975928ca..b822b2d74e5 100644 --- a/models/migrations/base/tests.go +++ b/models/migrations/base/tests.go @@ -204,7 +204,7 @@ func mainTest(m *testing.M) int { testlogger.Init() setting.SetupGiteaTestEnv() - tmpDataPath, cleanup, err := tempdir.OsTempDir("gitea-test").MkdirTempRandom("data") + tmpDataPath, cleanup, err := tempdir.OsTempDir("gitea-test").MkdirTempRandom("migration-test-data-") if err != nil { testlogger.Panicf("Unable to create temporary data path %v\n", err) } diff --git a/models/unittest/testdb.go b/models/unittest/testdb.go index 1750525f46c..b179dfb6fe2 100644 --- a/models/unittest/testdb.go +++ b/models/unittest/testdb.go @@ -15,7 +15,6 @@ import ( "code.gitea.io/gitea/models/system" "code.gitea.io/gitea/modules/cache" "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/setting/config" "code.gitea.io/gitea/modules/storage" @@ -44,7 +43,7 @@ func MainTest(m *testing.M, testOptsArg ...*TestOptions) { func mainTest(m *testing.M, testOptsArg ...*TestOptions) int { testOpts := util.OptionalArg(testOptsArg, &TestOptions{}) - appDataPath, appDataCleanup, err := tempdir.OsTempDir("gitea-test").MkdirTempRandom("appdata") + appDataPath, appDataCleanup, err := tempdir.OsTempDir("gitea-test").MkdirTempRandom("unit-test-data-") if err != nil { testlogger.Panicf("TempDir: %v\n", err) } @@ -59,9 +58,6 @@ APP_DATA_PATH = `+appDataPath+` os.Exit(1) } - _, _ = fmt.Fprintf(os.Stderr, "mainTest: appDataPath=%s\n%s\n", appDataPath, log.Stack(2)) - log.Error("mainTest: appDataPath=%s\n%s\n", appDataPath, log.Stack(2)) - giteaRoot := setting.GetGiteaTestSourceRoot() fixturesOpts := FixturesOptions{Dir: filepath.Join(giteaRoot, "models", "fixtures"), Files: testOpts.FixtureFiles} if err := CreateTestEngine(fixturesOpts); err != nil { diff --git a/modules/queue/manager_test.go b/modules/queue/manager_test.go index fda498cc841..ee6ccc46ff3 100644 --- a/modules/queue/manager_test.go +++ b/modules/queue/manager_test.go @@ -8,16 +8,11 @@ import ( "testing" "code.gitea.io/gitea/modules/setting" - "github.com/stretchr/testify/assert" ) func TestManager(t *testing.T) { - oldAppDataPath := setting.AppDataPath setting.AppDataPath = t.TempDir() - defer func() { - setting.AppDataPath = oldAppDataPath - }() newQueueFromConfig := func(name, cfg string) (*WorkerPoolQueue[int], error) { cfgProvider, err := setting.NewConfigProviderFromData(cfg) diff --git a/modules/setting/server.go b/modules/setting/server.go index dc58e43c435..56685a91652 100644 --- a/modules/setting/server.go +++ b/modules/setting/server.go @@ -278,6 +278,9 @@ func loadServerFrom(rootCfg ConfigProvider) { StaticRootPath = sec.Key("STATIC_ROOT_PATH").MustString(StaticRootPath) StaticCacheTime = sec.Key("STATIC_CACHE_TIME").MustDuration(6 * time.Hour) AppDataPath = sec.Key("APP_DATA_PATH").MustString(filepath.Join(AppWorkPath, "data")) + + log.Error("Set AppDataPath=%s\n%s\n", AppDataPath, log.Stack(2)) + if !filepath.IsAbs(AppDataPath) { AppDataPath = filepath.ToSlash(filepath.Join(AppWorkPath, AppDataPath)) }