status-im/consul
2
0
Fork 0
mirror of https://github.com/status-im/consul.git synced 2025-02-23 02:48:19 +00:00
Code Issues Projects Releases Wiki Activity

Minor formatting tweaks as a follow-up to #2654

Browse Source
This commit is contained in:
Kyle Havlovitz 2017-01-17 19:20:29 -05:00
parent d8dd39ac40
commit f48f105949
No known key found for this signature in database
GPG Key ID: 8A5E6B173056AD6C
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
consul/health_endpoint_test.go
View File

@ -399,12 +399,12 @@ func TestHealth_ServiceChecks_NodeMetaFilter(t *testing.T) {
for _, tc := range cases { for _, tc := range cases {
var out structs.IndexedHealthChecks var out structs.IndexedHealthChecks
inState := structs.ServiceSpecificRequest{ args := structs.ServiceSpecificRequest{
Datacenter: "dc1", Datacenter: "dc1",
NodeMetaFilters: tc.filters, NodeMetaFilters: tc.filters,
ServiceName: "db", ServiceName: "db",
} }
if err := msgpackrpc.CallWithCodec(codec, "Health.ServiceChecks", &inState, &out); err != nil { if err := msgpackrpc.CallWithCodec(codec, "Health.ServiceChecks", &args, &out); err != nil {
t.Fatalf("err: %v", err) t.Fatalf("err: %v", err)
} }

1
consul/structs/structs.go
View File

@ -289,6 +289,7 @@ type Node struct {
} }
type Nodes []*Node type Nodes []*Node
// SatisfiesMetaFilters returns true if the metadata map contains the given filters
func SatisfiesMetaFilters(meta map[string]string, filters map[string]string) bool { func SatisfiesMetaFilters(meta map[string]string, filters map[string]string) bool {
for key, value := range filters { for key, value := range filters {
if v, ok := meta[key]; !ok || v != value { if v, ok := meta[key]; !ok || v != value {

4
testutil/server.go
View File

@ -165,8 +165,8 @@ func NewTestServer(t TestingT) *TestServer {
// an optional callback function to modify the configuration. // an optional callback function to modify the configuration.
func NewTestServerConfig(t TestingT, cb ServerConfigCallback) *TestServer { func NewTestServerConfig(t TestingT, cb ServerConfigCallback) *TestServer {
if path, err := exec.LookPath("consul"); err != nil || path == "" { if path, err := exec.LookPath("consul"); err != nil || path == "" {
t.Fatal("consul not found on $PATH - download and install " + t.Fatal("consul not found on $PATH - download and install " +
"consul or skip this test") "consul or skip this test")
} }
dataDir, err := ioutil.TempDir("", "consul") dataDir, err := ioutil.TempDir("", "consul")