From a8e9f8389a61471fa372c815b216511201b56823 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?= Date: Mon, 25 Nov 2019 10:37:49 +0100 Subject: [PATCH] hugolib: Increase default timeout value to 30s Fixes #6502 --- hugolib/config.go | 2 +- hugolib/pagebundler_test.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hugolib/config.go b/hugolib/config.go index 133d126d6..1bed9c0d9 100644 --- a/hugolib/config.go +++ b/hugolib/config.go @@ -620,7 +620,7 @@ func loadDefaultSettingsFor(v *viper.Viper) error { v.SetDefault("disableAliases", false) v.SetDefault("debug", false) v.SetDefault("disableFastRender", false) - v.SetDefault("timeout", 15000) // 15 seconds + v.SetDefault("timeout", 30000) // 30 seconds v.SetDefault("enableInlineShortcodes", false) return nil diff --git a/hugolib/pagebundler_test.go b/hugolib/pagebundler_test.go index eb36700a2..c76cc6a77 100644 --- a/hugolib/pagebundler_test.go +++ b/hugolib/pagebundler_test.go @@ -64,7 +64,7 @@ func TestPageBundlerSiteRegular(t *testing.T) { if canonify { relURLBase = "" } - fs, cfg := newTestBundleSources(t) + fs, cfg := newTestBundleSources(c) cfg.Set("baseURL", baseURL) cfg.Set("canonifyURLs", canonify) @@ -92,7 +92,7 @@ func TestPageBundlerSiteRegular(t *testing.T) { cfg.Set("uglyURLs", ugly) - b := newTestSitesBuilderFromDepsCfg(t, deps.DepsCfg{Logger: loggers.NewErrorLogger(), Fs: fs, Cfg: cfg}).WithNothingAdded() + b := newTestSitesBuilderFromDepsCfg(c, deps.DepsCfg{Logger: loggers.NewErrorLogger(), Fs: fs, Cfg: cfg}).WithNothingAdded() b.Build(BuildCfg{}) @@ -672,7 +672,7 @@ Single content. } -func newTestBundleSources(t *testing.T) (*hugofs.Fs, *viper.Viper) { +func newTestBundleSources(t testing.TB) (*hugofs.Fs, *viper.Viper) { cfg, fs := newTestCfgBasic() c := qt.New(t)