mirror of
				https://gitee.com/gitea/gitea
				synced 2025-11-04 08:30:25 +08:00 
			
		
		
		
	Refactor the setting to make unit test easier (#22405)
Some bugs caused by less unit tests in fundamental packages. This PR refactor `setting` package so that create a unit test will be easier than before. - All `LoadFromXXX` files has been splited as two functions, one is `InitProviderFromXXX` and `LoadCommonSettings`. The first functions will only include the code to create or new a ini file. The second function will load common settings. - It also renames all functions in setting from `newXXXService` to `loadXXXSetting` or `loadXXXFrom` to make the function name less confusing. - Move `XORMLog` to `SQLLog` because it's a better name for that. Maybe we should finally move these `loadXXXSetting` into the `XXXInit` function? Any idea? --------- Co-authored-by: 6543 <6543@obermui.de> Co-authored-by: delvh <dev.lh@web.de>
This commit is contained in:
		@@ -87,8 +87,8 @@ func TestMain(m *testing.M) {
 | 
			
		||||
	c = routers.NormalRoutes(context.TODO())
 | 
			
		||||
 | 
			
		||||
	// integration test settings...
 | 
			
		||||
	if setting.Cfg != nil {
 | 
			
		||||
		testingCfg := setting.Cfg.Section("integration-tests")
 | 
			
		||||
	if setting.CfgProvider != nil {
 | 
			
		||||
		testingCfg := setting.CfgProvider.Section("integration-tests")
 | 
			
		||||
		tests.SlowTest = testingCfg.Key("SLOW_TEST").MustDuration(tests.SlowTest)
 | 
			
		||||
		tests.SlowFlush = testingCfg.Key("SLOW_FLUSH").MustDuration(tests.SlowFlush)
 | 
			
		||||
	}
 | 
			
		||||
 
 | 
			
		||||
@@ -57,7 +57,7 @@ func initMigrationTest(t *testing.T) func() {
 | 
			
		||||
		setting.CustomConf = giteaConf
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	setting.LoadForTest()
 | 
			
		||||
	setting.InitProviderAndLoadCommonSettingsForTest()
 | 
			
		||||
 | 
			
		||||
	assert.True(t, len(setting.RepoRootPath) != 0)
 | 
			
		||||
	assert.NoError(t, util.RemoveAll(setting.RepoRootPath))
 | 
			
		||||
@@ -83,8 +83,8 @@ func initMigrationTest(t *testing.T) func() {
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	assert.NoError(t, git.InitFull(context.Background()))
 | 
			
		||||
	setting.InitDBConfig()
 | 
			
		||||
	setting.NewLogServices(true)
 | 
			
		||||
	setting.LoadDBSetting()
 | 
			
		||||
	setting.InitLogs(true)
 | 
			
		||||
	return deferFn
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@@ -292,7 +292,7 @@ func doMigrationTest(t *testing.T, version string) {
 | 
			
		||||
		return
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	setting.NewXORMLogService(false)
 | 
			
		||||
	setting.InitSQLLog(false)
 | 
			
		||||
 | 
			
		||||
	err := db.InitEngineWithMigration(context.Background(), wrappedMigrate)
 | 
			
		||||
	assert.NoError(t, err)
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user