Skip to content

C
Coredns
Commit 31ce53f5 authored by Miek Gieben's avatar Miek Gieben
Browse files
Options

better (#104)

parent fed51ea3
Hide whitespace changes
Inline Side-by-side
Showing with 60 additions and 60 deletions
middleware/etcd/cname_test.go
View file @ 31ce53f5
...@@ -35,13 +35,13 @@ func TestCnameLookup(t *testing.T) { ...@@ -35,13 +35,13 @@ func TestCnameLookup(t *testing.T) {
t.Logf("%v\n", resp) t.Logf("%v\n", resp)
continue continue
} }
if !test.Section(t, tc, coretest.Answer, resp.Answer) { if !test.Section(t, tc, test.Answer, resp.Answer) {
t.Logf("%v\n", resp) t.Logf("%v\n", resp)
} }
if !test.Section(t, tc, coretest.Ns, resp.Ns) { if !test.Section(t, tc, test.Ns, resp.Ns) {
t.Logf("%v\n", resp) t.Logf("%v\n", resp)
} }
if !test.Section(t, tc, coretest.Extra, resp.Extra) { if !test.Section(t, tc, test.Extra, resp.Extra) {
t.Logf("%v\n", resp) t.Logf("%v\n", resp)
} }
} }
......
middleware/etcd/group_test.go
View file @ 31ce53f5
...@@ -41,13 +41,13 @@ func TestGroupLookup(t *testing.T) { ...@@ -41,13 +41,13 @@ func TestGroupLookup(t *testing.T) {
t.Logf("%v\n", resp) t.Logf("%v\n", resp)
continue continue
} }
if !test.Section(t, tc, coretest.Answer, resp.Answer) { if !test.Section(t, tc, test.Answer, resp.Answer) {
t.Logf("%v\n", resp) t.Logf("%v\n", resp)
} }
if !test.Section(t, tc, coretest.Ns, resp.Ns) { if !test.Section(t, tc, test.Ns, resp.Ns) {
t.Logf("%v\n", resp) t.Logf("%v\n", resp)
} }
if !test.Section(t, tc, coretest.Extra, resp.Extra) { if !test.Section(t, tc, test.Extra, resp.Extra) {
t.Logf("%v\n", resp) t.Logf("%v\n", resp)
} }
} }
......
middleware/etcd/lookup_test.go
View file @ 31ce53f5
...@@ -8,7 +8,7 @@ package etcd ...@@ -8,7 +8,7 @@ package etcd
import ( import (
"github.com/miekg/coredns/middleware/etcd/msg" "github.com/miekg/coredns/middleware/etcd/msg"
"github.com/miekg/coredns/middleware/testing" "github.com/miekg/coredns/middleware/test"
"github.com/miekg/dns" "github.com/miekg/dns"
) )
...@@ -32,87 +32,87 @@ var services = []*msg.Service{ ...@@ -32,87 +32,87 @@ var services = []*msg.Service{
{Host: "b.cname.skydns.test", Key: "a.cname.skydns.test."}, {Host: "b.cname.skydns.test", Key: "a.cname.skydns.test."},
} }
var dnsTestCases = []testing.Case{ var dnsTestCases = []test.Case{
// SRV Test // SRV Test
{ {
Qname: "a.server1.dev.region1.skydns.test.", Qtype: dns.TypeSRV, Qname: "a.server1.dev.region1.skydns.test.", Qtype: dns.TypeSRV,
Answer: []dns.RR{testing.SRV("a.server1.dev.region1.skydns.test. 300 SRV 10 100 8080 dev.server1.")}, Answer: []dns.RR{test.SRV("a.server1.dev.region1.skydns.test. 300 SRV 10 100 8080 dev.server1.")},
}, },
// SRV Test (case test) // SRV Test (case test)
{ {
Qname: "a.SERVer1.dEv.region1.skydns.tEst.", Qtype: dns.TypeSRV, Qname: "a.SERVer1.dEv.region1.skydns.tEst.", Qtype: dns.TypeSRV,
Answer: []dns.RR{testing.SRV("a.SERVer1.dEv.region1.skydns.tEst. 300 SRV 10 100 8080 dev.server1.")}, Answer: []dns.RR{test.SRV("a.SERVer1.dEv.region1.skydns.tEst. 300 SRV 10 100 8080 dev.server1.")},
}, },
// NXDOMAIN Test // NXDOMAIN Test
{ {
Qname: "doesnotexist.skydns.test.", Qtype: dns.TypeA, Qname: "doesnotexist.skydns.test.", Qtype: dns.TypeA,
Rcode: dns.RcodeNameError, Rcode: dns.RcodeNameError,
Ns: []dns.RR{ Ns: []dns.RR{
testing.SOA("skydns.test. 300 SOA ns.dns.skydns.test. hostmaster.skydns.test. 0 0 0 0 0"), test.SOA("skydns.test. 300 SOA ns.dns.skydns.test. hostmaster.skydns.test. 0 0 0 0 0"),
}, },
}, },
// A Test // A Test
{ {
Qname: "a.server1.prod.region1.skydns.test.", Qtype: dns.TypeA, Qname: "a.server1.prod.region1.skydns.test.", Qtype: dns.TypeA,
Answer: []dns.RR{testing.A("a.server1.prod.region1.skydns.test. 300 A 10.0.0.1")}, Answer: []dns.RR{test.A("a.server1.prod.region1.skydns.test. 300 A 10.0.0.1")},
}, },
// SRV Test where target is IP address // SRV Test where target is IP address
{ {
Qname: "a.server1.prod.region1.skydns.test.", Qtype: dns.TypeSRV, Qname: "a.server1.prod.region1.skydns.test.", Qtype: dns.TypeSRV,
Answer: []dns.RR{testing.SRV("a.server1.prod.region1.skydns.test. 300 SRV 10 100 8080 a.server1.prod.region1.skydns.test.")}, Answer: []dns.RR{test.SRV("a.server1.prod.region1.skydns.test. 300 SRV 10 100 8080 a.server1.prod.region1.skydns.test.")},
Extra: []dns.RR{testing.A("a.server1.prod.region1.skydns.test. 300 A 10.0.0.1")}, Extra: []dns.RR{test.A("a.server1.prod.region1.skydns.test. 300 A 10.0.0.1")},
}, },
// AAAA Test // AAAA Test
{ {
Qname: "b.server6.prod.region1.skydns.test.", Qtype: dns.TypeAAAA, Qname: "b.server6.prod.region1.skydns.test.", Qtype: dns.TypeAAAA,
Answer: []dns.RR{testing.AAAA("b.server6.prod.region1.skydns.test. 300 AAAA ::1")}, Answer: []dns.RR{test.AAAA("b.server6.prod.region1.skydns.test. 300 AAAA ::1")},
}, },
// Multiple A Record Test // Multiple A Record Test
{ {
Qname: "server1.prod.region1.skydns.test.", Qtype: dns.TypeA, Qname: "server1.prod.region1.skydns.test.", Qtype: dns.TypeA,
Answer: []dns.RR{ Answer: []dns.RR{
testing.A("server1.prod.region1.skydns.test. 300 A 10.0.0.1"), test.A("server1.prod.region1.skydns.test. 300 A 10.0.0.1"),
testing.A("server1.prod.region1.skydns.test. 300 A 10.0.0.2"), test.A("server1.prod.region1.skydns.test. 300 A 10.0.0.2"),
}, },
}, },
// Priority Test // Priority Test
{ {
Qname: "priority.skydns.test.", Qtype: dns.TypeSRV, Qname: "priority.skydns.test.", Qtype: dns.TypeSRV,
Answer: []dns.RR{testing.SRV("priority.skydns.test. 300 SRV 333 100 8080 priority.server1.")}, Answer: []dns.RR{test.SRV("priority.skydns.test. 300 SRV 333 100 8080 priority.server1.")},
}, },
// Subdomain Test // Subdomain Test
{ {
Qname: "sub.region1.skydns.test.", Qtype: dns.TypeSRV, Qname: "sub.region1.skydns.test.", Qtype: dns.TypeSRV,
Answer: []dns.RR{ Answer: []dns.RR{
testing.SRV("sub.region1.skydns.test. 300 IN SRV 10 33 0 sub.server1."), test.SRV("sub.region1.skydns.test. 300 IN SRV 10 33 0 sub.server1."),
testing.SRV("sub.region1.skydns.test. 300 IN SRV 10 33 80 sub.server2."), test.SRV("sub.region1.skydns.test. 300 IN SRV 10 33 80 sub.server2."),
testing.SRV("sub.region1.skydns.test. 300 IN SRV 10 33 8080 c.sub.region1.skydns.test."), test.SRV("sub.region1.skydns.test. 300 IN SRV 10 33 8080 c.sub.region1.skydns.test."),
}, },
Extra: []dns.RR{testing.A("c.sub.region1.skydns.test. 300 IN A 10.0.0.1")}, Extra: []dns.RR{test.A("c.sub.region1.skydns.test. 300 IN A 10.0.0.1")},
}, },
// CNAME (unresolvable internal name) // CNAME (unresolvable internal name)
{ {
Qname: "cname.prod.region1.skydns.test.", Qtype: dns.TypeA, Qname: "cname.prod.region1.skydns.test.", Qtype: dns.TypeA,
Ns: []dns.RR{testing.SOA("skydns.test. 300 SOA ns.dns.skydns.test. hostmaster.skydns.test. 0 0 0 0 0")}, Ns: []dns.RR{test.SOA("skydns.test. 300 SOA ns.dns.skydns.test. hostmaster.skydns.test. 0 0 0 0 0")},
}, },
// Wildcard Test // Wildcard Test
{ {
Qname: "*.region1.skydns.test.", Qtype: dns.TypeSRV, Qname: "*.region1.skydns.test.", Qtype: dns.TypeSRV,
Answer: []dns.RR{ Answer: []dns.RR{
testing.SRV("*.region1.skydns.test. 300 IN SRV 10 12 0 sub.server1."), test.SRV("*.region1.skydns.test. 300 IN SRV 10 12 0 sub.server1."),
testing.SRV("*.region1.skydns.test. 300 IN SRV 10 12 0 unresolvable.skydns.test."), test.SRV("*.region1.skydns.test. 300 IN SRV 10 12 0 unresolvable.skydns.test."),
testing.SRV("*.region1.skydns.test. 300 IN SRV 10 12 80 sub.server2."), test.SRV("*.region1.skydns.test. 300 IN SRV 10 12 80 sub.server2."),
testing.SRV("*.region1.skydns.test. 300 IN SRV 10 12 8080 a.server1.prod.region1.skydns.test."), test.SRV("*.region1.skydns.test. 300 IN SRV 10 12 8080 a.server1.prod.region1.skydns.test."),
testing.SRV("*.region1.skydns.test. 300 IN SRV 10 12 8080 b.server1.prod.region1.skydns.test."), test.SRV("*.region1.skydns.test. 300 IN SRV 10 12 8080 b.server1.prod.region1.skydns.test."),
testing.SRV("*.region1.skydns.test. 300 IN SRV 10 12 8080 b.server6.prod.region1.skydns.test."), test.SRV("*.region1.skydns.test. 300 IN SRV 10 12 8080 b.server6.prod.region1.skydns.test."),
testing.SRV("*.region1.skydns.test. 300 IN SRV 10 12 8080 c.sub.region1.skydns.test."), test.SRV("*.region1.skydns.test. 300 IN SRV 10 12 8080 c.sub.region1.skydns.test."),
testing.SRV("*.region1.skydns.test. 300 IN SRV 10 12 8080 dev.server1."), test.SRV("*.region1.skydns.test. 300 IN SRV 10 12 8080 dev.server1."),
}, },
Extra: []dns.RR{ Extra: []dns.RR{
testing.A("a.server1.prod.region1.skydns.test. 300 IN A 10.0.0.1"), test.A("a.server1.prod.region1.skydns.test. 300 IN A 10.0.0.1"),
testing.A("b.server1.prod.region1.skydns.test. 300 IN A 10.0.0.2"), test.A("b.server1.prod.region1.skydns.test. 300 IN A 10.0.0.2"),
testing.AAAA("b.server6.prod.region1.skydns.test. 300 IN AAAA ::1"), test.AAAA("b.server6.prod.region1.skydns.test. 300 IN AAAA ::1"),
testing.A("c.sub.region1.skydns.test. 300 IN A 10.0.0.1"), test.A("c.sub.region1.skydns.test. 300 IN A 10.0.0.1"),
}, },
}, },
// Wildcard Test // Wildcard Test
...@@ -120,40 +120,40 @@ var dnsTestCases = []testing.Case{ ...@@ -120,40 +120,40 @@ var dnsTestCases = []testing.Case{
Qname: "prod.*.skydns.test.", Qtype: dns.TypeSRV, Qname: "prod.*.skydns.test.", Qtype: dns.TypeSRV,
Answer: []dns.RR{ Answer: []dns.RR{
testing.SRV("prod.*.skydns.test. 300 IN SRV 10 25 0 unresolvable.skydns.test."), test.SRV("prod.*.skydns.test. 300 IN SRV 10 25 0 unresolvable.skydns.test."),
testing.SRV("prod.*.skydns.test. 300 IN SRV 10 25 8080 a.server1.prod.region1.skydns.test."), test.SRV("prod.*.skydns.test. 300 IN SRV 10 25 8080 a.server1.prod.region1.skydns.test."),
testing.SRV("prod.*.skydns.test. 300 IN SRV 10 25 8080 b.server1.prod.region1.skydns.test."), test.SRV("prod.*.skydns.test. 300 IN SRV 10 25 8080 b.server1.prod.region1.skydns.test."),
testing.SRV("prod.*.skydns.test. 300 IN SRV 10 25 8080 b.server6.prod.region1.skydns.test."), test.SRV("prod.*.skydns.test. 300 IN SRV 10 25 8080 b.server6.prod.region1.skydns.test."),
}, },
Extra: []dns.RR{ Extra: []dns.RR{
testing.A("a.server1.prod.region1.skydns.test. 300 IN A 10.0.0.1"), test.A("a.server1.prod.region1.skydns.test. 300 IN A 10.0.0.1"),
testing.A("b.server1.prod.region1.skydns.test. 300 IN A 10.0.0.2"), test.A("b.server1.prod.region1.skydns.test. 300 IN A 10.0.0.2"),
testing.AAAA("b.server6.prod.region1.skydns.test. 300 IN AAAA ::1"), test.AAAA("b.server6.prod.region1.skydns.test. 300 IN AAAA ::1"),
}, },
}, },
// Wildcard Test // Wildcard Test
{ {
Qname: "prod.any.skydns.test.", Qtype: dns.TypeSRV, Qname: "prod.any.skydns.test.", Qtype: dns.TypeSRV,
Answer: []dns.RR{ Answer: []dns.RR{
testing.SRV("prod.any.skydns.test. 300 IN SRV 10 25 0 unresolvable.skydns.test."), test.SRV("prod.any.skydns.test. 300 IN SRV 10 25 0 unresolvable.skydns.test."),
testing.SRV("prod.any.skydns.test. 300 IN SRV 10 25 8080 a.server1.prod.region1.skydns.test."), test.SRV("prod.any.skydns.test. 300 IN SRV 10 25 8080 a.server1.prod.region1.skydns.test."),
testing.SRV("prod.any.skydns.test. 300 IN SRV 10 25 8080 b.server1.prod.region1.skydns.test."), test.SRV("prod.any.skydns.test. 300 IN SRV 10 25 8080 b.server1.prod.region1.skydns.test."),
testing.SRV("prod.any.skydns.test. 300 IN SRV 10 25 8080 b.server6.prod.region1.skydns.test."), test.SRV("prod.any.skydns.test. 300 IN SRV 10 25 8080 b.server6.prod.region1.skydns.test."),
}, },
Extra: []dns.RR{ Extra: []dns.RR{
testing.A("a.server1.prod.region1.skydns.test. 300 IN A 10.0.0.1"), test.A("a.server1.prod.region1.skydns.test. 300 IN A 10.0.0.1"),
testing.A("b.server1.prod.region1.skydns.test. 300 IN A 10.0.0.2"), test.A("b.server1.prod.region1.skydns.test. 300 IN A 10.0.0.2"),
testing.AAAA("b.server6.prod.region1.skydns.test. 300 IN AAAA ::1"), test.AAAA("b.server6.prod.region1.skydns.test. 300 IN AAAA ::1"),
}, },
}, },
// CNAME loop detection // CNAME loop detection
{ {
Qname: "a.cname.skydns.test.", Qtype: dns.TypeA, Qname: "a.cname.skydns.test.", Qtype: dns.TypeA,
Ns: []dns.RR{testing.SOA("skydns.test. 300 SOA ns.dns.skydns.test. hostmaster.skydns.test. 1407441600 28800 7200 604800 60")}, Ns: []dns.RR{test.SOA("skydns.test. 300 SOA ns.dns.skydns.test. hostmaster.skydns.test. 1407441600 28800 7200 604800 60")},
}, },
// NODATA Test // NODATA Test
{ {
Qname: "a.server1.dev.region1.skydns.test.", Qtype: dns.TypeTXT, Qname: "a.server1.dev.region1.skydns.test.", Qtype: dns.TypeTXT,
Ns: []dns.RR{testing.SOA("skydns.test. 300 SOA ns.dns.skydns.test. hostmaster.skydns.test. 0 0 0 0 0")}, Ns: []dns.RR{test.SOA("skydns.test. 300 SOA ns.dns.skydns.test. hostmaster.skydns.test. 0 0 0 0 0")},
}, },
} }
middleware/etcd/multi_test.go
View file @ 31ce53f5
...@@ -44,13 +44,13 @@ func TestMultiLookup(t *testing.T) { ...@@ -44,13 +44,13 @@ func TestMultiLookup(t *testing.T) {
t.Logf("%v\n", resp) t.Logf("%v\n", resp)
continue continue
} }
if !test.Section(t, tc, coretest.Answer, resp.Answer) { if !test.Section(t, tc, test.Answer, resp.Answer) {
t.Logf("%v\n", resp) t.Logf("%v\n", resp)
} }
if !test.Section(t, tc, coretest.Ns, resp.Ns) { if !test.Section(t, tc, test.Ns, resp.Ns) {
t.Logf("%v\n", resp) t.Logf("%v\n", resp)
} }
if !test.Section(t, tc, coretest.Extra, resp.Extra) { if !test.Section(t, tc, test.Extra, resp.Extra) {
t.Logf("%v\n", resp) t.Logf("%v\n", resp)
} }
} }
......
middleware/etcd/other_test.go
View file @ 31ce53f5
...@@ -43,13 +43,13 @@ func TestOtherLookup(t *testing.T) { ...@@ -43,13 +43,13 @@ func TestOtherLookup(t *testing.T) {
t.Logf("%v\n", resp) t.Logf("%v\n", resp)
continue continue
} }
if !test.Section(t, tc, coretest.Answer, resp.Answer) { if !test.Section(t, tc, test.Answer, resp.Answer) {
t.Logf("%v\n", resp) t.Logf("%v\n", resp)
} }
if !test.Section(t, tc, coretest.Ns, resp.Ns) { if !test.Section(t, tc, test.Ns, resp.Ns) {
t.Logf("%v\n", resp) t.Logf("%v\n", resp)
} }
if !test.Section(t, tc, coretest.Extra, resp.Extra) { if !test.Section(t, tc, test.Extra, resp.Extra) {
t.Logf("%v\n", resp) t.Logf("%v\n", resp)
} }
} }
......
middleware/etcd/setup_test.go
View file @ 31ce53f5
...@@ -82,13 +82,13 @@ func TestLookup(t *testing.T) { ...@@ -82,13 +82,13 @@ func TestLookup(t *testing.T) {
t.Logf("%v\n", resp) t.Logf("%v\n", resp)
continue continue
} }
if !test.Section(t, tc, coretest.Answer, resp.Answer) { if !test.Section(t, tc, test.Answer, resp.Answer) {
t.Logf("%v\n", resp) t.Logf("%v\n", resp)
} }
if !test.Section(t, tc, coretest.Ns, resp.Ns) { if !test.Section(t, tc, test.Ns, resp.Ns) {
t.Logf("%v\n", resp) t.Logf("%v\n", resp)
} }
if !test.Section(t, tc, coretest.Extra, resp.Extra) { if !test.Section(t, tc, test.Extra, resp.Extra) {
t.Logf("%v\n", resp) t.Logf("%v\n", resp)
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment