From e7aa08564b526d73f83c208a6e26e872ee8c3dce Mon Sep 17 00:00:00 2001 From: Christian Schwarz Date: Sat, 21 Dec 2019 15:44:49 +0100 Subject: [PATCH] platformtest: harness: fix FailNow (harness wouldn't detect FailNow) (harness checks for recover() != nil) --- platformtest/platformtest.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/platformtest/platformtest.go b/platformtest/platformtest.go index 7b7a1ed..e506ba7 100644 --- a/platformtest/platformtest.go +++ b/platformtest/platformtest.go @@ -2,6 +2,7 @@ package platformtest import ( "context" + "fmt" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -12,6 +13,8 @@ type Context struct { RootDataset string } +var FailNowSentinel = fmt.Errorf("platformtest: FailNow called on context") + var _ assert.TestingT = (*Context)(nil) var _ require.TestingT = (*Context)(nil) @@ -20,5 +23,5 @@ func (c *Context) Errorf(format string, args ...interface{}) { } func (c *Context) FailNow() { - panic(nil) + panic(FailNowSentinel) }