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

Fix some retries in api pkg (#6124)

This commit is contained in:
Freddy 2019-07-12 12:57:41 -06:00 committed by GitHub
parent 5873c56a03
commit 97ecc0517c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
api/health_test.go
View File

@ -352,10 +352,10 @@ func TestAPI_HealthService_SingleTag(t *testing.T) {
defer agent.ServiceDeregister("foo1") defer agent.ServiceDeregister("foo1")
retry.Run(t, func(r *retry.R) { retry.Run(t, func(r *retry.R) {
services, meta, err := health.Service("foo", "bar", true, nil) services, meta, err := health.Service("foo", "bar", true, nil)
require.NoError(t, err) require.NoError(r, err)
require.NotEqual(t, meta.LastIndex, 0) require.NotEqual(r, meta.LastIndex, 0)
require.Len(t, services, 1) require.Len(r, services, 1)
require.Equal(t, services[0].Service.ID, "foo1") require.Equal(r, services[0].Service.ID, "foo1")
}) })
} }
func TestAPI_HealthService_MultipleTags(t *testing.T) { func TestAPI_HealthService_MultipleTags(t *testing.T) {
@ -397,19 +397,19 @@ func TestAPI_HealthService_MultipleTags(t *testing.T) {
retry.Run(t, func(r *retry.R) { retry.Run(t, func(r *retry.R) {
services, meta, err := health.ServiceMultipleTags("foo", []string{"bar"}, true, nil) services, meta, err := health.ServiceMultipleTags("foo", []string{"bar"}, true, nil)
require.NoError(t, err) require.NoError(r, err)
require.NotEqual(t, meta.LastIndex, 0) require.NotEqual(r, meta.LastIndex, 0)
require.Len(t, services, 2) require.Len(r, services, 2)
}) })
// Test searching with two tags (one result) // Test searching with two tags (one result)
retry.Run(t, func(r *retry.R) { retry.Run(t, func(r *retry.R) {
services, meta, err := health.ServiceMultipleTags("foo", []string{"bar", "v2"}, true, nil) services, meta, err := health.ServiceMultipleTags("foo", []string{"bar", "v2"}, true, nil)
require.NoError(t, err) require.NoError(r, err)
require.NotEqual(t, meta.LastIndex, 0) require.NotEqual(r, meta.LastIndex, 0)
require.Len(t, services, 1) require.Len(r, services, 1)
require.Equal(t, services[0].Service.ID, "foo2") require.Equal(r, services[0].Service.ID, "foo2")
}) })
} }
@ -427,11 +427,11 @@ func TestAPI_HealthService_NodeMetaFilter(t *testing.T) {
retry.Run(t, func(r *retry.R) { retry.Run(t, func(r *retry.R) {
// consul service should always exist... // consul service should always exist...
checks, meta, err := health.Service("consul", "", true, &QueryOptions{NodeMeta: meta}) checks, meta, err := health.Service("consul", "", true, &QueryOptions{NodeMeta: meta})
require.NoError(t, err) require.NoError(r, err)
require.NotEqual(t, meta.LastIndex, 0) require.NotEqual(r, meta.LastIndex, 0)
require.NotEqual(t, len(checks), 0) require.NotEqual(r, len(checks), 0)
require.Equal(t, checks[0].Node.Datacenter, "dc1") require.Equal(r, checks[0].Node.Datacenter, "dc1")
require.Contains(t, checks[0].Node.TaggedAddresses, "wan") require.Contains(r, checks[0].Node.TaggedAddresses, "wan")
}) })
} }