The parameter extraConfigs has never been used anywhere. This PR just removed it. It can be taken back once it's needed.tags/v1.22.0-rc0
@@ -44,12 +44,12 @@ func fatalTestError(fmtStr string, args ...any) { | |||
} | |||
// InitSettings initializes config provider and load common settings for tests | |||
func InitSettings(extraConfigs ...string) { | |||
func InitSettings() { | |||
if setting.CustomConf == "" { | |||
setting.CustomConf = filepath.Join(setting.CustomPath, "conf/app-unittest-tmp.ini") | |||
_ = os.Remove(setting.CustomConf) | |||
} | |||
setting.InitCfgProvider(setting.CustomConf, strings.Join(extraConfigs, "\n")) | |||
setting.InitCfgProvider(setting.CustomConf) | |||
setting.LoadCommonSettings() | |||
if err := setting.PrepareAppDataPath(); err != nil { |
@@ -196,7 +196,7 @@ func NewConfigProviderFromData(configContent string) (ConfigProvider, error) { | |||
// NewConfigProviderFromFile load configuration from file. | |||
// NOTE: do not print any log except error. | |||
func NewConfigProviderFromFile(file string, extraConfigs ...string) (ConfigProvider, error) { | |||
func NewConfigProviderFromFile(file string) (ConfigProvider, error) { | |||
cfg := ini.Empty(configProviderLoadOptions()) | |||
loadedFromEmpty := true | |||
@@ -213,12 +213,6 @@ func NewConfigProviderFromFile(file string, extraConfigs ...string) (ConfigProvi | |||
} | |||
} | |||
for _, s := range extraConfigs { | |||
if err := cfg.Append([]byte(s)); err != nil { | |||
return nil, fmt.Errorf("unable to append more config: %v", err) | |||
} | |||
} | |||
cfg.NameMapper = ini.SnackCase | |||
return &iniConfigProvider{ | |||
file: file, |
@@ -90,9 +90,9 @@ func PrepareAppDataPath() error { | |||
return nil | |||
} | |||
func InitCfgProvider(file string, extraConfigs ...string) { | |||
func InitCfgProvider(file string) { | |||
var err error | |||
if CfgProvider, err = NewConfigProviderFromFile(file, extraConfigs...); err != nil { | |||
if CfgProvider, err = NewConfigProviderFromFile(file); err != nil { | |||
log.Fatal("Unable to init config provider from %q: %v", file, err) | |||
} | |||
CfgProvider.DisableSaving() // do not allow saving the CfgProvider into file, it will be polluted by the "MustXxx" calls |