Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/gohugoio/hugo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2020-06-25 10:16:28 +0300
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2020-06-25 10:16:28 +0300
commit77aa385b84dbc1805ff7e34dafeadb181905c689 (patch)
tree3b26bf22e162aca128b3e9cf6ebac6305a41fb8c /hugolib
parent545a1c1cedc93d091050bae07c02fc2435ad2d20 (diff)
Enable the embedded template test when race detector is off
See #5926
Diffstat (limited to 'hugolib')
-rw-r--r--hugolib/embedded_templates_norace_test.go60
-rw-r--r--hugolib/embedded_templates_test.go40
2 files changed, 60 insertions, 40 deletions
diff --git a/hugolib/embedded_templates_norace_test.go b/hugolib/embedded_templates_norace_test.go
new file mode 100644
index 000000000..13b104110
--- /dev/null
+++ b/hugolib/embedded_templates_norace_test.go
@@ -0,0 +1,60 @@
+// Copyright 2018 The Hugo Authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// +build !race
+
+package hugolib
+
+import (
+ "testing"
+
+ qt "github.com/frankban/quicktest"
+)
+
+// Just some simple test of the embedded templates to avoid
+// https://github.com/gohugoio/hugo/issues/4757 and similar.
+// TODO(bep) fix me https://github.com/gohugoio/hugo/issues/5926
+func TestEmbeddedTemplates(t *testing.T) {
+ t.Parallel()
+
+ c := qt.New(t)
+ c.Assert(true, qt.Equals, true)
+
+ home := []string{"index.html", `
+GA:
+{{ template "_internal/google_analytics.html" . }}
+
+GA async:
+
+{{ template "_internal/google_analytics_async.html" . }}
+
+Disqus:
+
+{{ template "_internal/disqus.html" . }}
+
+`}
+
+ b := newTestSitesBuilder(t)
+ b.WithSimpleConfigFile().WithTemplatesAdded(home...)
+
+ b.Build(BuildCfg{})
+
+ // Gheck GA regular and async
+ b.AssertFileContent("public/index.html",
+ "'anonymizeIp', true",
+ "'script','https://www.google-analytics.com/analytics.js','ga');\n\tga('create', 'ga_id', 'auto')",
+ "<script async src='https://www.google-analytics.com/analytics.js'>")
+
+ // Disqus
+ b.AssertFileContent("public/index.html", "\"disqus_shortname\" + '.disqus.com/embed.js';")
+}
diff --git a/hugolib/embedded_templates_test.go b/hugolib/embedded_templates_test.go
index c6f2ab661..39a905589 100644
--- a/hugolib/embedded_templates_test.go
+++ b/hugolib/embedded_templates_test.go
@@ -15,48 +15,8 @@ package hugolib
import (
"testing"
-
- qt "github.com/frankban/quicktest"
)
-// Just some simple test of the embedded templates to avoid
-// https://github.com/gohugoio/hugo/issues/4757 and similar.
-// TODO(bep) fix me https://github.com/gohugoio/hugo/issues/5926
-func _TestEmbeddedTemplates(t *testing.T) {
- t.Parallel()
-
- c := qt.New(t)
- c.Assert(true, qt.Equals, true)
-
- home := []string{"index.html", `
-GA:
-{{ template "_internal/google_analytics.html" . }}
-
-GA async:
-
-{{ template "_internal/google_analytics_async.html" . }}
-
-Disqus:
-
-{{ template "_internal/disqus.html" . }}
-
-`}
-
- b := newTestSitesBuilder(t)
- b.WithSimpleConfigFile().WithTemplatesAdded(home...)
-
- b.Build(BuildCfg{})
-
- // Gheck GA regular and async
- b.AssertFileContent("public/index.html",
- "'anonymizeIp', true",
- "'script','https://www.google-analytics.com/analytics.js','ga');\n\tga('create', 'ga_id', 'auto')",
- "<script async src='https://www.google-analytics.com/analytics.js'>")
-
- // Disqus
- b.AssertFileContent("public/index.html", "\"disqus_shortname\" + '.disqus.com/embed.js';")
-}
-
func TestInternalTemplatesImage(t *testing.T) {
config := `
baseURL = "https://example.org"