From 4e3b13050bd083c1d12175aff227071c30fdce31 Mon Sep 17 00:00:00 2001 From: Deluan Date: Sun, 26 Jan 2020 18:07:06 -0500 Subject: [PATCH] fix: tests --- conf/configuration.go | 4 +++- tests/init_tests.go | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/conf/configuration.go b/conf/configuration.go index 0faea17e6..346f18236 100644 --- a/conf/configuration.go +++ b/conf/configuration.go @@ -40,7 +40,7 @@ func newWithPath(path string, skipFlags ...bool) *multiconfig.DefaultLoader { // Read default values defined via tag fields "default" 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") { 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") { loaders = append(loaders, &multiconfig.YAMLLoader{Path: path}) } + } else { + println("Skipping config file not found: ", path) } e := &multiconfig.EnvironmentLoader{} diff --git a/tests/init_tests.go b/tests/init_tests.go index bb2474e35..3ab445f6f 100644 --- a/tests/init_tests.go +++ b/tests/init_tests.go @@ -21,9 +21,9 @@ func Init(t *testing.T, skipOnShort bool) { _, file, _, _ := runtime.Caller(0) appPath, _ := filepath.Abs(filepath.Join(filepath.Dir(file), "..")) confPath, _ := filepath.Abs(filepath.Join(appPath, "tests", "navidrome-test.toml")) - + println("Loading test configuration file from " + confPath) os.Chdir(appPath) - conf.LoadFromFile(confPath, true) + conf.LoadFromFile("tests/navidrome-test.toml", true) noLog := os.Getenv("NOLOG") if noLog != "" {