TrueCloudLab/coredns
16
0
Fork 2
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Dont crash on tests with etcd running

Browse source
This commit is contained in:
Miek Gieben 2016-04-15 20:22:37 +01:00
parent a4bf01e1ee
commit 95477fd2fe
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
middleware/etcd/handler.go
View file

@ -30,6 +30,9 @@ func (e Etcd) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg) (i
zone := middleware.Zones(e.Zones).Matches(state.Name()) zone := middleware.Zones(e.Zones).Matches(state.Name())
if zone == "" { if zone == "" {
if e.Next == nil {
return dns.RcodeServerFailure, nil
}
return e.Next.ServeDNS(ctx, w, r) return e.Next.ServeDNS(ctx, w, r)
} }

4
middleware/etcd/stub_test.go
View file

@ -32,6 +32,10 @@ func TestStubLookup(t *testing.T) {
continue continue
} }
resp := rec.Msg() resp := rec.Msg()
if resp == nil {
// etcd not running?
continue
}
sort.Sort(test.RRSet(resp.Answer)) sort.Sort(test.RRSet(resp.Answer))
sort.Sort(test.RRSet(resp.Ns)) sort.Sort(test.RRSet(resp.Ns))