aboutsummaryrefslogtreecommitdiff
path: root/services
diff options
context:
space:
mode:
authorLunny Xiao2023-02-20 00:12:01 +0800
committerGitHub2023-02-20 00:12:01 +0800
commitc53ad052d8bd040ecd269d9757ce9885396a04af (patch)
tree7142da12dc9511445c76d3bf5616f1c220441a84 /services
parent2b02343e218755c36c6a45da8a53c06dfff843a1 (diff)
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>
Diffstat (limited to 'services')
-rw-r--r--services/webhook/main_test.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/services/webhook/main_test.go b/services/webhook/main_test.go
index 6cf941073..210221b12 100644
--- a/services/webhook/main_test.go
+++ b/services/webhook/main_test.go
@@ -15,8 +15,8 @@ import (
)
func TestMain(m *testing.M) {
- setting.LoadForTest()
- setting.NewQueueService()
+ setting.InitProviderAndLoadCommonSettingsForTest()
+ setting.LoadQueueSettings()
// for tests, allow only loopback IPs
setting.Webhook.AllowedHostList = hostmatcher.MatchBuiltinLoopback