status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

require -> assert until rebase

This commit is contained in:
Paul Banks 2018-03-27 10:49:27 +01:00 committed by Mitchell Hashimoto
parent 9309422fd9
commit 125555e1aa
No known key found for this signature in database
GPG Key ID: 744E147AA52F5B0A
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
api/health_test.go
View File

@ -7,7 +7,7 @@ import (
"github.com/hashicorp/consul/testutil" "github.com/hashicorp/consul/testutil"
"github.com/hashicorp/consul/testutil/retry" "github.com/hashicorp/consul/testutil/retry"
"github.com/pascaldekloe/goe/verify" "github.com/pascaldekloe/goe/verify"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/assert"
) )
func TestAPI_HealthNode(t *testing.T) { func TestAPI_HealthNode(t *testing.T) {
@ -297,7 +297,10 @@ func TestAPI_HealthConnect(t *testing.T) {
Port: 8000, Port: 8000,
} }
err := agent.ServiceRegister(reg) 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") defer agent.ServiceDeregister("foo")
// Register the proxy // Register the proxy
@ -308,7 +311,10 @@ func TestAPI_HealthConnect(t *testing.T) {
ProxyDestination: "foo", ProxyDestination: "foo",
} }
err = agent.ServiceRegister(proxyReg) 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") defer agent.ServiceDeregister("foo-proxy")
retry.Run(t, func(r *retry.R) { retry.Run(t, func(r *retry.R) {