all: Refactor to non-global logger

Note that this looks like overkill for just the logger, and that is correct,
but this will make sense once we start with the template handling etc.

Updates #2701

1 files changed, 14 insertions, 5 deletions

diff --git a/hugolib/site_test.go b/hugolib/site_test.go
index 440f4bd7c..14b75a112 100644
--- a/hugolib/site_test.go
+++ b/hugolib/site_test.go
@@ -58,6 +58,7 @@ func TestReadPagesFromSourceWithEmptySource(t *testing.T) {
 	sources := []source.ByteSource{}
 
 	s := &Site{
+		deps:    newDeps(DepsCfg{}),
 		Source:  &source.InMemorySource{ByteSource: sources},
 		targets: targetList{page: &target.PagePub{UglyURLs: true}},
 	}
@@ -102,14 +103,13 @@ func TestDegenerateRenderThingMissingTemplate(t *testing.T) {
 }
 
 func TestRenderWithInvalidTemplate(t *testing.T) {
-	jww.ResetLogCounters()
 
-	s := newSiteDefaultLang()
+	s := NewSiteDefaultLang()
 	if err := buildAndRenderSite(s, "missing", templateMissingFunc); err != nil {
 		t.Fatalf("Got build error: %s", err)
 	}
 
-	if jww.LogCountForLevelsGreaterThanorEqualTo(jww.LevelError) != 1 {
+	if s.log.LogCountForLevelsGreaterThanorEqualTo(jww.LevelError) != 1 {
 		t.Fatalf("Expecting the template to log an ERROR")
 	}
 }
@@ -127,6 +127,7 @@ func TestDraftAndFutureRender(t *testing.T) {
 
 	siteSetup := func(t *testing.T) *Site {
 		s := &Site{
+			deps:     newDeps(DepsCfg{}),
 			Source:   &source.InMemorySource{ByteSource: sources},
 			Language: helpers.NewDefaultLanguage(),
 		}
@@ -185,6 +186,7 @@ func TestFutureExpirationRender(t *testing.T) {
 
 	siteSetup := func(t *testing.T) *Site {
 		s := &Site{
+			deps:     newDeps(DepsCfg{}),
 			Source:   &source.InMemorySource{ByteSource: sources},
 			Language: helpers.NewDefaultLanguage(),
 		}
@@ -276,6 +278,7 @@ THE END.`, refShortcode)),
 	}
 
 	s := &Site{
+		deps:     newDeps(DepsCfg{}),
 		Source:   &source.InMemorySource{ByteSource: sources},
 		targets:  targetList{page: &target.PagePub{UglyURLs: uglyURLs}},
 		Language: helpers.NewDefaultLanguage(),
@@ -343,6 +346,7 @@ func doTestShouldAlwaysHaveUglyURLs(t *testing.T, uglyURLs bool) {
 	}
 
 	s := &Site{
+		deps:     newDeps(DepsCfg{}),
 		Source:   &source.InMemorySource{ByteSource: sources},
 		targets:  targetList{page: &target.PagePub{UglyURLs: uglyURLs, PublishDir: "public"}},
 		Language: helpers.NewDefaultLanguage(),
@@ -393,7 +397,6 @@ func doTestShouldAlwaysHaveUglyURLs(t *testing.T, uglyURLs bool) {
 
 // Issue #1176
 func TestSectionNaming(t *testing.T) {
-	//jww.SetStdoutThreshold(jww.LevelDebug)
 
 	for _, canonify := range []bool{true, false} {
 		for _, uglify := range []bool{true, false} {
@@ -431,7 +434,7 @@ func doTestSectionNaming(t *testing.T, canonify, uglify, pluralize bool) {
 		writeSource(t, filepath.Join("content", source.Name), string(source.Content))
 	}
 
-	s := newSiteDefaultLang()
+	s := NewSiteDefaultLang()
 
 	if err := buildAndRenderSite(s,
 		"_default/single.html", "{{.Content}}",
@@ -482,6 +485,7 @@ func TestSkipRender(t *testing.T) {
 	viper.Set("canonifyURLs", true)
 	viper.Set("baseURL", "http://auth/bub")
 	s := &Site{
+		deps:     newDeps(DepsCfg{}),
 		Source:   &source.InMemorySource{ByteSource: sources},
 		targets:  targetList{page: &target.PagePub{UglyURLs: true}},
 		Language: helpers.NewDefaultLanguage(),
@@ -537,6 +541,7 @@ func TestAbsURLify(t *testing.T) {
 			viper.Set("canonifyURLs", canonify)
 			viper.Set("baseURL", baseURL)
 			s := &Site{
+				deps:     newDeps(DepsCfg{}),
 				Source:   &source.InMemorySource{ByteSource: sources},
 				targets:  targetList{page: &target.PagePub{UglyURLs: true}},
 				Language: helpers.NewDefaultLanguage(),
@@ -633,6 +638,7 @@ func TestOrderedPages(t *testing.T) {
 
 	viper.Set("baseURL", "http://auth/bub")
 	s := &Site{
+		deps:     newDeps(DepsCfg{}),
 		Source:   &source.InMemorySource{ByteSource: weightedSources},
 		Language: helpers.NewDefaultLanguage(),
 	}
@@ -702,6 +708,7 @@ func TestGroupedPages(t *testing.T) {
 
 	viper.Set("baseURL", "http://auth/bub")
 	s := &Site{
+		deps:     newDeps(DepsCfg{}),
 		Source:   &source.InMemorySource{ByteSource: groupedSources},
 		Language: helpers.NewDefaultLanguage(),
 	}
@@ -887,6 +894,7 @@ func TestWeightedTaxonomies(t *testing.T) {
 	viper.Set("baseURL", "http://auth/bub")
 	viper.Set("taxonomies", taxonomies)
 	s := &Site{
+		deps:     newDeps(DepsCfg{}),
 		Source:   &source.InMemorySource{ByteSource: sources},
 		Language: helpers.NewDefaultLanguage(),
 	}
@@ -956,6 +964,7 @@ func setupLinkingMockSite(t *testing.T) *Site {
 			"sourceRelativeLinksProjectFolder": "/docs"})
 
 	site := &Site{
+		deps:     newDeps(DepsCfg{}),
 		Source:   &source.InMemorySource{ByteSource: sources},
 		Language: helpers.NewDefaultLanguage(),
 	}