-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
e2e: move consul status check helpers to e2eutil (#6314)
- Loading branch information
Showing
2 changed files
with
75 additions
and
67 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| package e2eutil | ||
|
|
||
| import ( | ||
| "time" | ||
|
|
||
| capi "github.com/hashicorp/consul/api" | ||
| "github.com/stretchr/testify/require" | ||
| ) | ||
|
|
||
| // RequireConsulStatus asserts the aggregate health of the service converges to | ||
| // the expected status | ||
| func RequireConsulStatus(require *require.Assertions, | ||
| client *capi.Client, serviceName, expectedStatus string) { | ||
| require.Eventually(func() bool { | ||
| _, status := serviceStatus(require, client, serviceName) | ||
| return status == expectedStatus | ||
| }, 30*time.Second, time.Second, // needs a long time for killing tasks/clients | ||
| "timed out expecting %q to become %q", | ||
| serviceName, expectedStatus, | ||
| ) | ||
| } | ||
|
|
||
| // serviceStatus gets the aggregate health of the service and returns | ||
| // the []ServiceEntry for further checking | ||
| func serviceStatus(require *require.Assertions, | ||
| client *capi.Client, serviceName string) ([]*capi.ServiceEntry, string) { | ||
| services, _, err := client.Health().Service(serviceName, "", false, nil) | ||
| require.NoError(err, "expected no error for %q, got %v", serviceName, err) | ||
| if len(services) > 0 { | ||
| return services, services[0].Checks.AggregatedStatus() | ||
| } | ||
| return nil, "(unknown status)" | ||
| } | ||
|
|
||
| // RequireConsulDeregistered asserts that the service eventually is deregistered from Consul | ||
| func RequireConsulDeregistered(require *require.Assertions, | ||
| client *capi.Client, serviceName string) { | ||
| require.Eventually(func() bool { | ||
| services, _, err := client.Health().Service(serviceName, "", false, nil) | ||
| require.NoError(err, "expected no error for %q, got %v", serviceName, err) | ||
| return len(services) == 0 | ||
| }, 5*time.Second, time.Second) | ||
| } |