mirrors/navidrome
1
0
Fork 0
mirror of https://github.com/navidrome/navidrome.git synced 2025-04-03 20:47:35 +03:00
Code Issues Projects Releases Packages Wiki Activity

fix: tests

Browse source
This commit is contained in:
Deluan 2020-01-26 18:07:06 -05:00
parent cc6eacd608
commit 4e3b13050b
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
conf/configuration.go
View file

@ -40,7 +40,7 @@ func newWithPath(path string, skipFlags ...bool) *multiconfig.DefaultLoader {
// Read default values defined via tag fields "default" // Read default values defined via tag fields "default"
loaders = append(loaders, &multiconfig.TagLoader{}) loaders = append(loaders, &multiconfig.TagLoader{})
if _, err := os.Stat(consts.LocalConfigFile); err == nil { if _, err := os.Stat(path); err == nil {
if strings.HasSuffix(path, "toml") { if strings.HasSuffix(path, "toml") {
loaders = append(loaders, &multiconfig.TOMLLoader{Path: path}) loaders = append(loaders, &multiconfig.TOMLLoader{Path: path})
} }
@ -52,6 +52,8 @@ func newWithPath(path string, skipFlags ...bool) *multiconfig.DefaultLoader {
if strings.HasSuffix(path, "yml") || strings.HasSuffix(path, "yaml") { if strings.HasSuffix(path, "yml") || strings.HasSuffix(path, "yaml") {
loaders = append(loaders, &multiconfig.YAMLLoader{Path: path}) loaders = append(loaders, &multiconfig.YAMLLoader{Path: path})
} }
} else {
println("Skipping config file not found: ", path)
} }
e := &multiconfig.EnvironmentLoader{} e := &multiconfig.EnvironmentLoader{}

4
tests/init_tests.go
View file

@ -21,9 +21,9 @@ func Init(t *testing.T, skipOnShort bool) {
_, file, _, _ := runtime.Caller(0) _, file, _, _ := runtime.Caller(0)
appPath, _ := filepath.Abs(filepath.Join(filepath.Dir(file), "..")) appPath, _ := filepath.Abs(filepath.Join(filepath.Dir(file), ".."))
confPath, _ := filepath.Abs(filepath.Join(appPath, "tests", "navidrome-test.toml")) confPath, _ := filepath.Abs(filepath.Join(appPath, "tests", "navidrome-test.toml"))
println("Loading test configuration file from " + confPath)
os.Chdir(appPath) os.Chdir(appPath)
conf.LoadFromFile(confPath, true) conf.LoadFromFile("tests/navidrome-test.toml", true)
noLog := os.Getenv("NOLOG") noLog := os.Getenv("NOLOG")
if noLog != "" { if noLog != "" {