require -> assert until rebase

api/health_test.go

@@ -7,7 +7,7 @@ import (
 	"github.com/hashicorp/consul/testutil"
 	"github.com/hashicorp/consul/testutil/retry"
 	"github.com/pascaldekloe/goe/verify"
-	"github.com/stretchr/testify/require"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestAPI_HealthNode(t *testing.T) {
@@ -297,7 +297,10 @@ func TestAPI_HealthConnect(t *testing.T) {
 		Port: 8000,
 	}
 	err := agent.ServiceRegister(reg)
-	require.Nil(t, err)
+	// TODO replace with require.Nil when we have it vendored in OSS and rebased
+	if !assert.Nil(t, err) {
+		return
+	}
 	defer agent.ServiceDeregister("foo")
 
 	// Register the proxy
@@ -308,7 +311,10 @@ func TestAPI_HealthConnect(t *testing.T) {
 		ProxyDestination: "foo",
 	}
 	err = agent.ServiceRegister(proxyReg)
-	require.Nil(t, err)
+	// TODO replace with require.Nil when we have it vendored in OSS and rebased
+	if !assert.Nil(t, err) {
+		return
+	}
 	defer agent.ServiceDeregister("foo-proxy")
 
 	retry.Run(t, func(r *retry.R) {