Add mdns test and fix the bug it revealed

This commit is contained in:
Asim 2016-05-01 21:21:15 +01:00
parent a53fc54b70
commit 96104aa209
2 changed files with 143 additions and 1 deletions

View File

@ -218,10 +218,14 @@ func (m *mdnsRegistry) GetService(service string) ([]*registry.Service, error) {
continue continue
} }
if txt.Service != service {
continue
}
s, ok := serviceMap[txt.Version] s, ok := serviceMap[txt.Version]
if !ok { if !ok {
s = &registry.Service{ s = &registry.Service{
Name: service, Name: txt.Service,
Version: txt.Version, Version: txt.Version,
Endpoints: txt.Endpoints, Endpoints: txt.Endpoints,
} }

138
registry/mdns/mdns_test.go Normal file
View File

@ -0,0 +1,138 @@
package mdns
import (
"testing"
"time"
"github.com/micro/go-micro/registry"
)
func TestMDNS(t *testing.T) {
testData := []*registry.Service{
&registry.Service{
Name: "test1",
Version: "1.0.1",
Nodes: []*registry.Node{
&registry.Node{
Id: "test1-1",
Address: "10.0.0.1",
Port: 10001,
Metadata: map[string]string{
"foo": "bar",
},
},
},
},
&registry.Service{
Name: "test2",
Version: "1.0.2",
Nodes: []*registry.Node{
&registry.Node{
Id: "test2-1",
Address: "10.0.0.2",
Port: 10002,
Metadata: map[string]string{
"foo2": "bar2",
},
},
},
},
&registry.Service{
Name: "test3",
Version: "1.0.3",
Nodes: []*registry.Node{
&registry.Node{
Id: "test3-1",
Address: "10.0.0.3",
Port: 10003,
Metadata: map[string]string{
"foo3": "bar3",
},
},
},
},
}
// new registry
r := NewRegistry()
for _, service := range testData {
// register service
if err := r.Register(service); err != nil {
t.Fatal(err)
}
// get registered service
s, err := r.GetService(service.Name)
if err != nil {
t.Fatal(err)
}
if len(s) != 1 {
for _, srv := range s {
t.Logf("%+v", srv)
}
t.Fatalf("Expected one result for %s got %d", service.Name, len(s))
}
if s[0].Name != service.Name {
t.Fatal("Expected name %s got %s", service.Name, s[0].Name)
}
if s[0].Version != service.Version {
t.Fatal("Expected version %s got %s", service.Version, s[0].Version)
}
if len(s[0].Nodes) != 1 {
t.Fatalf("Expected 1 node, got %d", len(s[0].Nodes))
}
node := s[0].Nodes[0]
if node.Id != service.Nodes[0].Id {
t.Fatalf("Expected node id %s got %s", service.Nodes[0].Id, node.Id)
}
if node.Address != service.Nodes[0].Address {
t.Fatalf("Expected node address %s got %s", service.Nodes[0].Address, node.Address)
}
if node.Port != service.Nodes[0].Port {
t.Fatalf("Expected node port %s got %s", service.Nodes[0].Port, node.Port)
}
}
services, err := r.ListServices()
if err != nil {
t.Fatal(err)
}
for _, service := range testData {
var seen bool
for _, s := range services {
if s.Name == service.Name {
seen = true
break
}
}
if !seen {
t.Fatalf("Expected service %s got nothing", service.Name)
}
// deregister
if err := r.Deregister(service); err != nil {
t.Fatal(err)
}
time.Sleep(time.Millisecond * 5)
// check its gone
s, _ := r.GetService(service.Name)
if len(s) > 0 {
t.Fatalf("Expected nothing got %+v", s[0])
}
}
}