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

Rename middleware/testing (#103)

Browse Source 
Rename to test and name the toplevel tests dir to test for consitency.
This commit is contained in:
Miek Gieben
2016-04-11 07:56:38 +01:00
parent 0ea2a6088d
commit 4829b40efa
21 changed files with 261 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
middleware/etcd/cname_test.go
View File

@@ -9,7 +9,7 @@ import (
"github.com/miekg/coredns/middleware"
"github.com/miekg/coredns/middleware/etcd/msg"
coretest "github.com/miekg/coredns/middleware/testing"
"github.com/miekg/coredns/middleware/test"
"github.com/miekg/dns"
)
@@ -23,7 +23,7 @@ func TestCnameLookup(t *testing.T) {
for _, tc := range dnsTestCasesCname {
m := tc.Msg()
rec := middleware.NewResponseRecorder(&coretest.ResponseWriter{})
rec := middleware.NewResponseRecorder(&test.ResponseWriter{})
_, err := etc.ServeDNS(ctx, rec, m)
if err != nil {
t.Errorf("expected no error, got %v\n", err)
@@ -31,17 +31,17 @@ func TestCnameLookup(t *testing.T) {
}
resp := rec.Msg()
if !coretest.Header(t, tc, resp) {
if !test.Header(t, tc, resp) {
t.Logf("%v\n", resp)
continue
}
if !coretest.Section(t, tc, coretest.Answer, resp.Answer) {
if !test.Section(t, tc, coretest.Answer, resp.Answer) {
t.Logf("%v\n", resp)
}
if !coretest.Section(t, tc, coretest.Ns, resp.Ns) {
if !test.Section(t, tc, coretest.Ns, resp.Ns) {
t.Logf("%v\n", resp)
}
if !coretest.Section(t, tc, coretest.Extra, resp.Extra) {
if !test.Section(t, tc, coretest.Extra, resp.Extra) {
t.Logf("%v\n", resp)
}
}
@@ -58,20 +58,20 @@ var servicesCname = []*msg.Service{
{Host: "10.240.0.1", Key: "endpoint.region2.skydns.test."},
}
var dnsTestCasesCname = []coretest.Case{
var dnsTestCasesCname = []test.Case{
{
Qname: "a.server1.dev.region1.skydns.test.", Qtype: dns.TypeSRV,
Answer: []dns.RR{
coretest.SRV("a.server1.dev.region1.skydns.test. 300 IN SRV 10 100 0 cname1.region2.skydns.test."),
test.SRV("a.server1.dev.region1.skydns.test. 300 IN SRV 10 100 0 cname1.region2.skydns.test."),
},
Extra: []dns.RR{
coretest.CNAME("cname1.region2.skydns.test. 300 IN CNAME cname2.region2.skydns.test."),
coretest.CNAME("cname2.region2.skydns.test. 300 IN CNAME cname3.region2.skydns.test."),
coretest.CNAME("cname3.region2.skydns.test. 300 IN CNAME cname4.region2.skydns.test."),
coretest.CNAME("cname4.region2.skydns.test. 300 IN CNAME cname5.region2.skydns.test."),
coretest.CNAME("cname5.region2.skydns.test. 300 IN CNAME cname6.region2.skydns.test."),
coretest.CNAME("cname6.region2.skydns.test. 300 IN CNAME endpoint.region2.skydns.test."),
coretest.A("endpoint.region2.skydns.test. 300 IN A 10.240.0.1"),
test.CNAME("cname1.region2.skydns.test. 300 IN CNAME cname2.region2.skydns.test."),
test.CNAME("cname2.region2.skydns.test. 300 IN CNAME cname3.region2.skydns.test."),
test.CNAME("cname3.region2.skydns.test. 300 IN CNAME cname4.region2.skydns.test."),
test.CNAME("cname4.region2.skydns.test. 300 IN CNAME cname5.region2.skydns.test."),
test.CNAME("cname5.region2.skydns.test. 300 IN CNAME cname6.region2.skydns.test."),
test.CNAME("cname6.region2.skydns.test. 300 IN CNAME endpoint.region2.skydns.test."),
test.A("endpoint.region2.skydns.test. 300 IN A 10.240.0.1"),
},
},
}

30
middleware/etcd/group_test.go
View File

@@ -12,7 +12,7 @@ import (
"github.com/miekg/coredns/middleware"
"github.com/miekg/coredns/middleware/etcd/msg"
coretest "github.com/miekg/coredns/middleware/testing"
"github.com/miekg/coredns/middleware/test"
"github.com/miekg/dns"
)
@@ -25,7 +25,7 @@ func TestGroupLookup(t *testing.T) {
for _, tc := range dnsTestCasesGroup {
m := tc.Msg()
rec := middleware.NewResponseRecorder(&coretest.ResponseWriter{})
rec := middleware.NewResponseRecorder(&test.ResponseWriter{})
_, err := etc.ServeDNS(ctx, rec, m)
if err != nil {
t.Errorf("expected no error, got %v\n", err)
@@ -33,21 +33,21 @@ func TestGroupLookup(t *testing.T) {
}
resp := rec.Msg()
sort.Sort(coretest.RRSet(resp.Answer))
sort.Sort(coretest.RRSet(resp.Ns))
sort.Sort(coretest.RRSet(resp.Extra))
sort.Sort(test.RRSet(resp.Answer))
sort.Sort(test.RRSet(resp.Ns))
sort.Sort(test.RRSet(resp.Extra))
if !coretest.Header(t, tc, resp) {
if !test.Header(t, tc, resp) {
t.Logf("%v\n", resp)
continue
}
if !coretest.Section(t, tc, coretest.Answer, resp.Answer) {
if !test.Section(t, tc, coretest.Answer, resp.Answer) {
t.Logf("%v\n", resp)
}
if !coretest.Section(t, tc, coretest.Ns, resp.Ns) {
if !test.Section(t, tc, coretest.Ns, resp.Ns) {
t.Logf("%v\n", resp)
}
if !coretest.Section(t, tc, coretest.Extra, resp.Extra) {
if !test.Section(t, tc, coretest.Extra, resp.Extra) {
t.Logf("%v\n", resp)
}
}
@@ -65,29 +65,29 @@ var servicesGroup = []*msg.Service{
{Host: "127.0.0.2", Key: "b.sub.dom1.skydns.test.", Group: "g2"},
}
var dnsTestCasesGroup = []coretest.Case{
var dnsTestCasesGroup = []test.Case{
// Groups
{
// hits the group 'g1' and only includes those records
Qname: "dom.skydns.test.", Qtype: dns.TypeA,
Answer: []dns.RR{
coretest.A("dom.skydns.test. 300 IN A 127.0.0.1"),
coretest.A("dom.skydns.test. 300 IN A 127.0.0.2"),
test.A("dom.skydns.test. 300 IN A 127.0.0.1"),
test.A("dom.skydns.test. 300 IN A 127.0.0.2"),
},
},
{
// One has group, the other has not... Include the non-group always.
Qname: "dom2.skydns.test.", Qtype: dns.TypeA,
Answer: []dns.RR{
coretest.A("dom2.skydns.test. 300 IN A 127.0.0.1"),
coretest.A("dom2.skydns.test. 300 IN A 127.0.0.2"),
test.A("dom2.skydns.test. 300 IN A 127.0.0.1"),
test.A("dom2.skydns.test. 300 IN A 127.0.0.2"),
},
},
{
// The groups differ.
Qname: "dom1.skydns.test.", Qtype: dns.TypeA,
Answer: []dns.RR{
coretest.A("dom1.skydns.test. 300 IN A 127.0.0.1"),
test.A("dom1.skydns.test. 300 IN A 127.0.0.1"),
},
},
}

26
middleware/etcd/multi_test.go
View File

@@ -11,7 +11,7 @@ import (
"github.com/miekg/coredns/middleware"
"github.com/miekg/coredns/middleware/etcd/msg"
coretest "github.com/miekg/coredns/middleware/testing"
"github.com/miekg/coredns/middleware/test"
"github.com/miekg/dns"
)
@@ -19,7 +19,7 @@ import (
func TestMultiLookup(t *testing.T) {
etcMulti := etc
etcMulti.Zones = []string{"skydns.test.", "miek.nl."}
etcMulti.Next = coretest.ErrorHandler()
etcMulti.Next = test.ErrorHandler()
for _, serv := range servicesMulti {
set(t, etcMulti, serv.Key, 0, serv)
@@ -28,7 +28,7 @@ func TestMultiLookup(t *testing.T) {
for _, tc := range dnsTestCasesMulti {
m := tc.Msg()
rec := middleware.NewResponseRecorder(&coretest.ResponseWriter{})
rec := middleware.NewResponseRecorder(&test.ResponseWriter{})
_, err := etcMulti.ServeDNS(ctx, rec, m)
if err != nil {
t.Errorf("expected no error, got %v\n", err)
@@ -36,21 +36,21 @@ func TestMultiLookup(t *testing.T) {
}
resp := rec.Msg()
sort.Sort(coretest.RRSet(resp.Answer))
sort.Sort(coretest.RRSet(resp.Ns))
sort.Sort(coretest.RRSet(resp.Extra))
sort.Sort(test.RRSet(resp.Answer))
sort.Sort(test.RRSet(resp.Ns))
sort.Sort(test.RRSet(resp.Extra))
if !coretest.Header(t, tc, resp) {
if !test.Header(t, tc, resp) {
t.Logf("%v\n", resp)
continue
}
if !coretest.Section(t, tc, coretest.Answer, resp.Answer) {
if !test.Section(t, tc, coretest.Answer, resp.Answer) {
t.Logf("%v\n", resp)
}
if !coretest.Section(t, tc, coretest.Ns, resp.Ns) {
if !test.Section(t, tc, coretest.Ns, resp.Ns) {
t.Logf("%v\n", resp)
}
if !coretest.Section(t, tc, coretest.Extra, resp.Extra) {
if !test.Section(t, tc, coretest.Extra, resp.Extra) {
t.Logf("%v\n", resp)
}
}
@@ -63,14 +63,14 @@ var servicesMulti = []*msg.Service{
{Host: "dev.server1", Port: 8080, Key: "a.server1.dev.region1.example.org."},
}
var dnsTestCasesMulti = []coretest.Case{
var dnsTestCasesMulti = []test.Case{
{
Qname: "a.server1.dev.region1.skydns.test.", Qtype: dns.TypeSRV,
Answer: []dns.RR{coretest.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.")},
},
{
Qname: "a.server1.dev.region1.miek.nl.", Qtype: dns.TypeSRV,
Answer: []dns.RR{coretest.SRV("a.server1.dev.region1.miek.nl. 300 SRV 10 100 8080 dev.server1.")},
Answer: []dns.RR{test.SRV("a.server1.dev.region1.miek.nl. 300 SRV 10 100 8080 dev.server1.")},
},
{
Qname: "a.server1.dev.region1.example.org.", Qtype: dns.TypeSRV, Rcode: dns.RcodeServerFailure,

46
middleware/etcd/other_test.go
View File

@@ -14,7 +14,7 @@ import (
"github.com/miekg/coredns/middleware"
"github.com/miekg/coredns/middleware/etcd/msg"
coretest "github.com/miekg/coredns/middleware/testing"
"github.com/miekg/coredns/middleware/test"
"github.com/miekg/dns"
)
@@ -27,7 +27,7 @@ func TestOtherLookup(t *testing.T) {
for _, tc := range dnsTestCasesOther {
m := tc.Msg()
rec := middleware.NewResponseRecorder(&coretest.ResponseWriter{})
rec := middleware.NewResponseRecorder(&test.ResponseWriter{})
_, err := etc.ServeDNS(ctx, rec, m)
if err != nil {
t.Errorf("expected no error, got %v\n", err)
@@ -35,21 +35,21 @@ func TestOtherLookup(t *testing.T) {
}
resp := rec.Msg()
sort.Sort(coretest.RRSet(resp.Answer))
sort.Sort(coretest.RRSet(resp.Ns))
sort.Sort(coretest.RRSet(resp.Extra))
sort.Sort(test.RRSet(resp.Answer))
sort.Sort(test.RRSet(resp.Ns))
sort.Sort(test.RRSet(resp.Extra))
if !coretest.Header(t, tc, resp) {
if !test.Header(t, tc, resp) {
t.Logf("%v\n", resp)
continue
}
if !coretest.Section(t, tc, coretest.Answer, resp.Answer) {
if !test.Section(t, tc, coretest.Answer, resp.Answer) {
t.Logf("%v\n", resp)
}
if !coretest.Section(t, tc, coretest.Ns, resp.Ns) {
if !test.Section(t, tc, coretest.Ns, resp.Ns) {
t.Logf("%v\n", resp)
}
if !coretest.Section(t, tc, coretest.Extra, resp.Extra) {
if !test.Section(t, tc, coretest.Extra, resp.Extra) {
t.Logf("%v\n", resp)
}
}
@@ -79,57 +79,57 @@ var servicesOther = []*msg.Service{
{Host: "10.11.11.10", Key: "https.multiport.http.skydns.test.", Port: 443},
}
var dnsTestCasesOther = []coretest.Case{
var dnsTestCasesOther = []test.Case{
// MX Tests
{
// NODATA as this is not an Mail: true record.
Qname: "a.server1.dev.region1.skydns.test.", Qtype: dns.TypeMX,
Ns: []dns.RR{
coretest.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"),
},
},
{
Qname: "a.mail.skydns.test.", Qtype: dns.TypeMX,
Answer: []dns.RR{coretest.MX("a.mail.skydns.test. 300 IN MX 50 mx.skydns.test.")},
Answer: []dns.RR{test.MX("a.mail.skydns.test. 300 IN MX 50 mx.skydns.test.")},
Extra: []dns.RR{
coretest.A("a.ipaddr.skydns.test. 300 IN A 172.16.1.1"),
coretest.CNAME("mx.skydns.test. 300 IN CNAME a.ipaddr.skydns.test."),
test.A("a.ipaddr.skydns.test. 300 IN A 172.16.1.1"),
test.CNAME("mx.skydns.test. 300 IN CNAME a.ipaddr.skydns.test."),
},
},
{
Qname: "mx2.skydns.test.", Qtype: dns.TypeMX,
Answer: []dns.RR{
coretest.MX("mx2.skydns.test. 300 IN MX 10 a.ipaddr.skydns.test."),
coretest.MX("mx2.skydns.test. 300 IN MX 10 b.ipaddr.skydns.test."),
test.MX("mx2.skydns.test. 300 IN MX 10 a.ipaddr.skydns.test."),
test.MX("mx2.skydns.test. 300 IN MX 10 b.ipaddr.skydns.test."),
},
Extra: []dns.RR{
coretest.A("a.ipaddr.skydns.test. 300 A 172.16.1.1"),
coretest.A("b.ipaddr.skydns.test. 300 A 172.16.1.2"),
test.A("a.ipaddr.skydns.test. 300 A 172.16.1.1"),
test.A("b.ipaddr.skydns.test. 300 A 172.16.1.2"),
},
},
// Txt
{
Qname: "a1.txt.skydns.test.", Qtype: dns.TypeTXT,
Answer: []dns.RR{
coretest.TXT("a1.txt.skydns.test. 300 IN TXT \"abc\""),
test.TXT("a1.txt.skydns.test. 300 IN TXT \"abc\""),
},
},
{
Qname: "a2.txt.skydns.test.", Qtype: dns.TypeTXT,
Answer: []dns.RR{
coretest.TXT("a2.txt.skydns.test. 300 IN TXT \"abc abc\""),
test.TXT("a2.txt.skydns.test. 300 IN TXT \"abc abc\""),
},
},
{
Qname: "txt.skydns.test.", Qtype: dns.TypeTXT,
Answer: []dns.RR{
coretest.TXT("txt.skydns.test. 300 IN TXT \"abc abc\""),
coretest.TXT("txt.skydns.test. 300 IN TXT \"abc\""),
test.TXT("txt.skydns.test. 300 IN TXT \"abc abc\""),
test.TXT("txt.skydns.test. 300 IN TXT \"abc\""),
},
},
// Duplicate IP address test
{
Qname: "multiport.http.skydns.test.", Qtype: dns.TypeA,
Answer: []dns.RR{coretest.A("multiport.http.skydns.test. 300 IN A 10.11.11.10")},
Answer: []dns.RR{test.A("multiport.http.skydns.test. 300 IN A 10.11.11.10")},
},
}

18
middleware/etcd/setup_test.go
View File

@@ -15,7 +15,7 @@ import (
"github.com/miekg/coredns/middleware/etcd/msg"
"github.com/miekg/coredns/middleware/etcd/singleflight"
"github.com/miekg/coredns/middleware/proxy"
coretest "github.com/miekg/coredns/middleware/testing"
"github.com/miekg/coredns/middleware/test"
etcdc "github.com/coreos/etcd/client"
"golang.org/x/net/context"
@@ -66,7 +66,7 @@ func TestLookup(t *testing.T) {
for _, tc := range dnsTestCases {
m := tc.Msg()
rec := middleware.NewResponseRecorder(&coretest.ResponseWriter{})
rec := middleware.NewResponseRecorder(&test.ResponseWriter{})
_, err := etc.ServeDNS(ctx, rec, m)
if err != nil {
t.Errorf("expected no error, got %v\n", err)
@@ -74,21 +74,21 @@ func TestLookup(t *testing.T) {
}
resp := rec.Msg()
sort.Sort(coretest.RRSet(resp.Answer))
sort.Sort(coretest.RRSet(resp.Ns))
sort.Sort(coretest.RRSet(resp.Extra))
sort.Sort(test.RRSet(resp.Answer))
sort.Sort(test.RRSet(resp.Ns))
sort.Sort(test.RRSet(resp.Extra))
if !coretest.Header(t, tc, resp) {
if !test.Header(t, tc, resp) {
t.Logf("%v\n", resp)
continue
}
if !coretest.Section(t, tc, coretest.Answer, resp.Answer) {
if !test.Section(t, tc, coretest.Answer, resp.Answer) {
t.Logf("%v\n", resp)
}
if !coretest.Section(t, tc, coretest.Ns, resp.Ns) {
if !test.Section(t, tc, coretest.Ns, resp.Ns) {
t.Logf("%v\n", resp)
}
if !coretest.Section(t, tc, coretest.Extra, resp.Extra) {
if !test.Section(t, tc, coretest.Extra, resp.Extra) {
t.Logf("%v\n", resp)
}
}