Mirrors/coredns
1
0
Fork 0
mirror of https://github.com/coredns/coredns.git synced 2025-10-29 09:14:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

Better tests

Browse Source 
Signed-off-by: Miek Gieben <miek@miek.nl>
This commit is contained in:
Miek Gieben
2020-03-29 09:17:27 +02:00
parent 8f5cbf363e
commit 36dec4ca85
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
plugin/traffic/traffic.go
View File

@@ -48,7 +48,7 @@ func (t *Traffic) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg
m.SetReply(r) m.SetReply(r)
m.Authoritative = true m.Authoritative = true
healthy := state.QType() == dns.TypeTXT healthy := state.QType() != dns.TypeTXT
sockaddr, ok := t.c.Select(cluster, healthy) sockaddr, ok := t.c.Select(cluster, healthy)
if !ok { if !ok {
// ok this cluster doesn't exist, potentially due to extra labels, which may be garbage or legit queries: // ok this cluster doesn't exist, potentially due to extra labels, which may be garbage or legit queries:
@@ -56,6 +56,7 @@ func (t *Traffic) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg
// endpoint-N.cluster // endpoint-N.cluster
// _grpclb._tcp.cluster // _grpclb._tcp.cluster
// _tcp.cluster // _tcp.cluster
// _grpc_config.cluster (singled out here, but not handled)
labels := dns.SplitDomainName(cluster) labels := dns.SplitDomainName(cluster)
switch len(labels) { switch len(labels) {
case 2: case 2:

20
plugin/traffic/traffic_test.go
View File

@@ -117,6 +117,16 @@ func TestTraffic(t *testing.T) {
}, },
cluster: "endpoint-1.web", qtype: dns.TypeA, rcode: dns.RcodeSuccess, answer: "127.0.0.3", cluster: "endpoint-1.web", qtype: dns.TypeA, rcode: dns.RcodeSuccess, answer: "127.0.0.3",
}, },
// TXT query for _grpc_config
{
cla: &endpointpb.ClusterLoadAssignment{
ClusterName: "web",
Endpoints: endpoints([]EndpointHealth{
{"127.0.0.2", 18008, corepb.HealthStatus_HEALTHY},
}),
},
cluster: "_grpc_config.web", qtype: dns.TypeTXT, rcode: dns.RcodeNameError, ns: true,
},
} }
ctx := context.TODO() ctx := context.TODO()
@@ -133,16 +143,16 @@ func TestTraffic(t *testing.T) {
rec := dnstest.NewRecorder(&test.ResponseWriter{}) rec := dnstest.NewRecorder(&test.ResponseWriter{})
_, err := tr.ServeDNS(ctx, rec, m) _, err := tr.ServeDNS(ctx, rec, m)
if err != nil { if err != nil {
t.Errorf("Test %d: Expected no error, but got %q", i, err) t.Errorf("Test %d: Expected no error for %q, but got %q", i, cl, err)
} }
if rec.Msg.Rcode != tc.rcode { if rec.Msg.Rcode != tc.rcode {
t.Errorf("Test %d: Expected no rcode %d, but got %d", i, tc.rcode, rec.Msg.Rcode) t.Errorf("Test %d: Expected no rcode %d for %q, but got %d", i, tc.rcode, cl, rec.Msg.Rcode)
} }
if tc.ns && len(rec.Msg.Ns) == 0 { if tc.ns && len(rec.Msg.Ns) == 0 {
t.Errorf("Test %d: Expected authority section, but got none", i) t.Errorf("Test %d: Expected authority section for %q, but got none", i, cl)
} }
if tc.answer != "" && len(rec.Msg.Answer) == 0 { if tc.answer != "" && len(rec.Msg.Answer) == 0 {
t.Fatalf("Test %d: Expected answer section, but got none", i) t.Fatalf("Test %d: Expected answer section for %q, but got none", i, cl)
} }
if tc.answer != "" { if tc.answer != "" {
record := rec.Msg.Answer[0] record := rec.Msg.Answer[0]
@@ -158,7 +168,7 @@ func TestTraffic(t *testing.T) {
addr = x.Txt[3] addr = x.Txt[3]
} }
if tc.answer != addr { if tc.answer != addr {
t.Errorf("Test %d: Expected answer %s, but got %s", i, tc.answer, addr) t.Errorf("Test %d: Expected answer %q for %q, but got %s", i, tc.answer, cl, addr)
} }
} }
} }