From dc3f3df29d2b65532cedc9d321db7c4a38a28d7d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bj=C3=B8rn=20Erik=20Pedersen?= Date: Wed, 4 Sep 2019 09:50:32 +0200 Subject: [PATCH] hugolib: Adjust Go version specific test See #6304 --- hugolib/hugo_sites_build_errors_test.go | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/hugolib/hugo_sites_build_errors_test.go b/hugolib/hugo_sites_build_errors_test.go index 6c9c8b08..21b745cc 100644 --- a/hugolib/hugo_sites_build_errors_test.go +++ b/hugolib/hugo_sites_build_errors_test.go @@ -3,8 +3,6 @@ package hugolib import ( "fmt" "path/filepath" - "regexp" - "runtime" "strings" "testing" "time" @@ -212,14 +210,9 @@ func TestSiteBuildErrors(t *testing.T) { assertBuildError: func(a testSiteBuildErrorAsserter, err error) { a.c.Assert(err, qt.Not(qt.IsNil)) - // This is fixed in latest Go source - if regexp.MustCompile("devel|12").MatchString(runtime.Version()) { - fe := a.getFileError(err) - a.c.Assert(fe.Position().LineNumber, qt.Equals, 5) - a.c.Assert(fe.Position().ColumnNumber, qt.Equals, 21) - } else { - a.c.Assert(err.Error(), qt.Contains, `execute of template failed: panic in Execute`) - } + fe := a.getFileError(err) + a.c.Assert(fe.Position().LineNumber, qt.Equals, 5) + a.c.Assert(fe.Position().ColumnNumber, qt.Equals, 21) }, }, } -- 2.30.2