From d392893cd73dc00c927f342778f6dca9628d328e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?= Date: Wed, 9 Jun 2021 10:58:18 +0200 Subject: Misc config loading fixes The main motivation behind this is simplicity and correctnes, but the new small config library is also faster: ``` BenchmarkDefaultConfigProvider/Viper-16 252418 4546 ns/op 2720 B/op 30 allocs/op BenchmarkDefaultConfigProvider/Custom-16 450756 2651 ns/op 1008 B/op 6 allocs/op ``` Fixes #8633 Fixes #8618 Fixes #8630 Updates #8591 Closes #6680 Closes #5192 --- hugofs/fs_test.go | 9 +++++---- hugofs/rootmapping_fs_test.go | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) (limited to 'hugofs') diff --git a/hugofs/fs_test.go b/hugofs/fs_test.go index a343bbd1f..8d52267af 100644 --- a/hugofs/fs_test.go +++ b/hugofs/fs_test.go @@ -16,15 +16,16 @@ package hugofs import ( "testing" + "github.com/gohugoio/hugo/config" + qt "github.com/frankban/quicktest" "github.com/gohugoio/hugo/htesting/hqt" "github.com/spf13/afero" - "github.com/spf13/viper" ) func TestNewDefault(t *testing.T) { c := qt.New(t) - v := viper.New() + v := config.New() f := NewDefault(v) c.Assert(f.Source, qt.Not(qt.IsNil)) @@ -35,7 +36,7 @@ func TestNewDefault(t *testing.T) { func TestNewMem(t *testing.T) { c := qt.New(t) - v := viper.New() + v := config.New() f := NewMem(v) c.Assert(f.Source, qt.Not(qt.IsNil)) @@ -48,7 +49,7 @@ func TestNewMem(t *testing.T) { func TestWorkingDir(t *testing.T) { c := qt.New(t) - v := viper.New() + v := config.New() v.Set("workingDir", "/a/b/") diff --git a/hugofs/rootmapping_fs_test.go b/hugofs/rootmapping_fs_test.go index fc2ddeb62..db9ed25cd 100644 --- a/hugofs/rootmapping_fs_test.go +++ b/hugofs/rootmapping_fs_test.go @@ -20,7 +20,7 @@ import ( "sort" "testing" - "github.com/spf13/viper" + "github.com/gohugoio/hugo/config" qt "github.com/frankban/quicktest" "github.com/gohugoio/hugo/htesting" @@ -29,7 +29,7 @@ import ( func TestLanguageRootMapping(t *testing.T) { c := qt.New(t) - v := viper.New() + v := config.New() v.Set("contentDir", "content") fs := NewBaseFileDecorator(afero.NewMemMapFs()) -- cgit v1.2.3