From: Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Date: Tue, 13 Jun 2017 19:22:47 +0000 (+0200)
Subject: hugolib: Disable shaky leaktest on CI
X-Git-Tag: v0.23~16
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=5103935ae80536fbe0624c408016cdcbd1f03c1d;p=brevno-suite%2Fhugo

hugolib: Disable shaky leaktest on CI
---

diff --git a/hugolib/hugo_sites_build_test.go b/hugolib/hugo_sites_build_test.go
index 988a3691..e7d79165 100644
--- a/hugolib/hugo_sites_build_test.go
+++ b/hugolib/hugo_sites_build_test.go
@@ -392,8 +392,10 @@ func doTestMultiSitesBuild(t *testing.T, configTemplate, configSuffix string) {
 
 func TestMultiSitesRebuild(t *testing.T) {
 	// t.Parallel() not supported, see https://github.com/fortytw2/leaktest/issues/4
-	defer leaktest.CheckTimeout(t, 30*time.Second)()
-
+	// This leaktest seems to be a little bit shaky on Travis.
+	if !isCI() {
+		defer leaktest.CheckTimeout(t, 30*time.Second)()
+	}
 	siteConfig := testSiteConfig{Fs: afero.NewMemMapFs(), DefaultContentLanguage: "fr", DefaultContentLanguageInSubdir: true}
 	sites := createMultiTestSites(t, siteConfig, multiSiteTOMLConfigTemplate)
 	fs := sites.Fs
diff --git a/hugolib/testhelpers_test.go b/hugolib/testhelpers_test.go
index c386e620..3db2d9d5 100644
--- a/hugolib/testhelpers_test.go
+++ b/hugolib/testhelpers_test.go
@@ -208,3 +208,7 @@ func writeSourcesToSource(t *testing.T, base string, fs *hugofs.Fs, sources ...s
 		writeSource(t, fs, filepath.Join(base, src.Name), string(src.Content))
 	}
 }
+
+func isCI() bool {
+	return os.Getenv("CI") != ""
+}