summaryrefslogtreecommitdiffstats
path: root/hugolib/integrationtest_builder.go
diff options
context:
space:
mode:
authorBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2022-06-04 17:39:34 +0200
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2022-06-04 17:47:20 +0200
commit311b8008bfba3411741ef8ebe4b094adb92ce041 (patch)
treeb79e2023069fd48f5023f0b03b820542ee26dd65 /hugolib/integrationtest_builder.go
parentc7d5f9f067fd6a37ac6b75cb1c02259debd3ff21 (diff)
helpers: Fix panic with invalid defaultMarkdownHandler
Fixes #9968
Diffstat (limited to 'hugolib/integrationtest_builder.go')
-rw-r--r--hugolib/integrationtest_builder.go15
1 files changed, 12 insertions, 3 deletions
diff --git a/hugolib/integrationtest_builder.go b/hugolib/integrationtest_builder.go
index df51b37c3..9dcfe4830 100644
--- a/hugolib/integrationtest_builder.go
+++ b/hugolib/integrationtest_builder.go
@@ -197,7 +197,10 @@ func (s *IntegrationTestBuilder) Build() *IntegrationTestBuilder {
func (s *IntegrationTestBuilder) BuildE() (*IntegrationTestBuilder, error) {
s.Helper()
- s.initBuilder()
+ if err := s.initBuilder(); err != nil {
+ return s, err
+ }
+
err := s.build(BuildCfg{})
return s, err
}
@@ -267,7 +270,8 @@ func (s *IntegrationTestBuilder) FileContent(filename string) string {
return s.readWorkingDir(s, s.fs, filepath.FromSlash(filename))
}
-func (s *IntegrationTestBuilder) initBuilder() {
+func (s *IntegrationTestBuilder) initBuilder() error {
+ var initErr error
s.builderInit.Do(func() {
var afs afero.Fs
if s.Cfg.NeedsOsFS {
@@ -320,7 +324,10 @@ func (s *IntegrationTestBuilder) initBuilder() {
depsCfg := deps.DepsCfg{Cfg: cfg, Fs: fs, Running: s.Cfg.Running, Logger: logger}
sites, err := NewHugoSites(depsCfg)
- s.Assert(err, qt.IsNil)
+ if err != nil {
+ initErr = err
+ return
+ }
s.H = sites
s.fs = fs
@@ -338,6 +345,8 @@ func (s *IntegrationTestBuilder) initBuilder() {
}
})
+
+ return initErr
}
func (s *IntegrationTestBuilder) absFilename(filename string) string {