Merge pull request #29 from launchdarkly/eb/sc-140751/eventually-panic

eli-darkly · web-flow · commit 97e3679f29e4 · 2022-02-04T15:08:24.000-08:00
avoid trying to trigger early test exit from within an Eventually loop
diff --git a/sdktests/helpers.go b/sdktests/helpers.go
@@ -18,6 +18,7 @@ import (
 	"gopkg.in/launchdarkly/go-server-sdk-evaluation.v1/ldbuilders"
 	"gopkg.in/launchdarkly/go-server-sdk-evaluation.v1/ldmodel"
 
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
@@ -151,7 +152,7 @@ func checkForUpdatedValue(
 			return true
 		}
 		if !actualValue.Equal(previousValue) {
-			require.Fail(t, "SDK returned neither previous value nor updated value",
+			assert.Fail(t, "SDK returned neither previous value nor updated value",
 				"previous: %s, updated: %s, actual: %s", previousValue, updatedValue, actualValue)
 		}
 		return false

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ import (`
`18`	`18`	`"gopkg.in/launchdarkly/go-server-sdk-evaluation.v1/ldbuilders"`
`19`	`19`	`"gopkg.in/launchdarkly/go-server-sdk-evaluation.v1/ldmodel"`
`20`	`20`
	`21`	`+ "github.com/stretchr/testify/assert"`
`21`	`22`	`"github.com/stretchr/testify/require"`
`22`	`23`	`)`
`23`	`24`
`@@ -151,7 +152,7 @@ func checkForUpdatedValue(`
`151`	`152`	`return true`
`152`	`153`	`}`
`153`	`154`	`if !actualValue.Equal(previousValue) {`
`154`		`- require.Fail(t, "SDK returned neither previous value nor updated value",`
	`155`	`+ assert.Fail(t, "SDK returned neither previous value nor updated value",`
`155`	`156`	`"previous: %s, updated: %s, actual: %s", previousValue, updatedValue, actualValue)`
`156`	`157`	`}`
`157`	`158`	`return false`