Skip to content

C
Coredns
Commit 4829b40e authored by Miek Gieben's avatar Miek Gieben
Browse files
Options

Rename middleware/testing (#103) 

Rename to test and name the toplevel tests dir to test for consitency.
parent 0ea2a608
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 261 additions and 261 deletions
middleware/chaos/chaos_test.go
View file @ 4829b40e
...@@ -4,7 +4,7 @@ import ( ...@@ -4,7 +4,7 @@ import (
"testing" "testing"
"github.com/miekg/coredns/middleware" "github.com/miekg/coredns/middleware"
coretest "github.com/miekg/coredns/middleware/testing" "github.com/miekg/coredns/middleware/test"
"github.com/miekg/dns" "github.com/miekg/dns"
"golang.org/x/net/context" "golang.org/x/net/context"
...@@ -49,28 +49,28 @@ func TestChaos(t *testing.T) { ...@@ -49,28 +49,28 @@ func TestChaos(t *testing.T) {
ctx := context.TODO() ctx := context.TODO()
for i, test := range tests { for i, tc := range tests {
req := new(dns.Msg) req := new(dns.Msg)
if test.qtype == 0 { if tc.qtype == 0 {
test.qtype = dns.TypeTXT tc.qtype = dns.TypeTXT
} }
req.SetQuestion(dns.Fqdn(test.qname), test.qtype) req.SetQuestion(dns.Fqdn(tc.qname), tc.qtype)
req.Question[0].Qclass = dns.ClassCHAOS req.Question[0].Qclass = dns.ClassCHAOS
em.Next = test.next em.Next = tc.next
rec := middleware.NewResponseRecorder(&coretest.ResponseWriter{}) rec := middleware.NewResponseRecorder(&test.ResponseWriter{})
code, err := em.ServeDNS(ctx, rec, req) code, err := em.ServeDNS(ctx, rec, req)
if err != test.expectedErr { if err != tc.expectedErr {
t.Errorf("Test %d: Expected error %v, but got %v", i, test.expectedErr, err) t.Errorf("Test %d: Expected error %v, but got %v", i, tc.expectedErr, err)
} }
if code != int(test.expectedCode) { if code != int(tc.expectedCode) {
t.Errorf("Test %d: Expected status code %d, but got %d", i, test.expectedCode, code) t.Errorf("Test %d: Expected status code %d, but got %d", i, tc.expectedCode, code)
} }
if test.expectedReply != "" { if tc.expectedReply != "" {
answer := rec.Msg().Answer[0].(*dns.TXT).Txt[0] answer := rec.Msg().Answer[0].(*dns.TXT).Txt[0]
if answer != test.expectedReply { if answer != tc.expectedReply {
t.Errorf("Test %d: Expected answer %s, but got %s", i, test.expectedReply, answer) t.Errorf("Test %d: Expected answer %s, but got %s", i, tc.expectedReply, answer)
} }
} }
} }
......
middleware/errors/errors.go
View file @ 4829b40e
...@@ -8,10 +8,10 @@ import ( ...@@ -8,10 +8,10 @@ import (
"strings" "strings"
"time" "time"
"golang.org/x/net/context"
"github.com/miekg/coredns/middleware" "github.com/miekg/coredns/middleware"
"github.com/miekg/dns" "github.com/miekg/dns"
"golang.org/x/net/context"
) )
// ErrorHandler handles DNS errors (and errors from other middleware). // ErrorHandler handles DNS errors (and errors from other middleware).
......
middleware/errors/errors_test.go
View file @ 4829b40e
...@@ -9,7 +9,7 @@ import ( ...@@ -9,7 +9,7 @@ import (
"testing" "testing"
"github.com/miekg/coredns/middleware" "github.com/miekg/coredns/middleware"
coretest "github.com/miekg/coredns/middleware/testing" "github.com/miekg/coredns/middleware/test"
"github.com/miekg/dns" "github.com/miekg/dns"
"golang.org/x/net/context" "golang.org/x/net/context"
...@@ -44,23 +44,23 @@ func TestErrors(t *testing.T) { ...@@ -44,23 +44,23 @@ func TestErrors(t *testing.T) {
req := new(dns.Msg) req := new(dns.Msg)
req.SetQuestion("example.org.", dns.TypeA) req.SetQuestion("example.org.", dns.TypeA)
for i, test := range tests { for i, tc := range tests {
em.Next = test.next em.Next = tc.next
buf.Reset() buf.Reset()
rec := middleware.NewResponseRecorder(&coretest.ResponseWriter{}) rec := middleware.NewResponseRecorder(&test.ResponseWriter{})
code, err := em.ServeDNS(ctx, rec, req) code, err := em.ServeDNS(ctx, rec, req)
if err != test.expectedErr { if err != tc.expectedErr {
t.Errorf("Test %d: Expected error %v, but got %v", t.Errorf("Test %d: Expected error %v, but got %v",
i, test.expectedErr, err) i, tc.expectedErr, err)
} }
if code != test.expectedCode { if code != tc.expectedCode {
t.Errorf("Test %d: Expected status code %d, but got %d", t.Errorf("Test %d: Expected status code %d, but got %d",
i, test.expectedCode, code) i, tc.expectedCode, code)
} }
if log := buf.String(); !strings.Contains(log, test.expectedLog) { if log := buf.String(); !strings.Contains(log, tc.expectedLog) {
t.Errorf("Test %d: Expected log %q, but got %q", t.Errorf("Test %d: Expected log %q, but got %q",
i, test.expectedLog, log) i, tc.expectedLog, log)
} }
} }
} }
...@@ -78,7 +78,7 @@ func TestVisibleErrorWithPanic(t *testing.T) { ...@@ -78,7 +78,7 @@ func TestVisibleErrorWithPanic(t *testing.T) {
req := new(dns.Msg) req := new(dns.Msg)
req.SetQuestion("example.org.", dns.TypeA) req.SetQuestion("example.org.", dns.TypeA)
rec := middleware.NewResponseRecorder(&coretest.ResponseWriter{}) rec := middleware.NewResponseRecorder(&test.ResponseWriter{})
code, err := eh.ServeDNS(ctx, rec, req) code, err := eh.ServeDNS(ctx, rec, req)
if code != 0 { if code != 0 {
......
middleware/etcd/cname_test.go
View file @ 4829b40e
...@@ -9,7 +9,7 @@ import ( ...@@ -9,7 +9,7 @@ import (
"github.com/miekg/coredns/middleware" "github.com/miekg/coredns/middleware"
"github.com/miekg/coredns/middleware/etcd/msg" "github.com/miekg/coredns/middleware/etcd/msg"
coretest "github.com/miekg/coredns/middleware/testing" "github.com/miekg/coredns/middleware/test"
"github.com/miekg/dns" "github.com/miekg/dns"
) )
...@@ -23,7 +23,7 @@ func TestCnameLookup(t *testing.T) { ...@@ -23,7 +23,7 @@ func TestCnameLookup(t *testing.T) {
for _, tc := range dnsTestCasesCname { for _, tc := range dnsTestCasesCname {
m := tc.Msg() m := tc.Msg()
rec := middleware.NewResponseRecorder(&coretest.ResponseWriter{}) rec := middleware.NewResponseRecorder(&test.ResponseWriter{})
_, err := etc.ServeDNS(ctx, rec, m) _, err := etc.ServeDNS(ctx, rec, m)
if err != nil { if err != nil {
t.Errorf("expected no error, got %v\n", err) t.Errorf("expected no error, got %v\n", err)
...@@ -31,17 +31,17 @@ func TestCnameLookup(t *testing.T) { ...@@ -31,17 +31,17 @@ func TestCnameLookup(t *testing.T) {
} }
resp := rec.Msg() resp := rec.Msg()
if !coretest.Header(t, tc, resp) { if !test.Header(t, tc, resp) {
t.Logf("%v\n", resp) t.Logf("%v\n", resp)
continue continue
} }
if !coretest.Section(t, tc, coretest.Answer, resp.Answer) { if !test.Section(t, tc, coretest.Answer, resp.Answer) {
t.Logf("%v\n", resp) 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) 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) t.Logf("%v\n", resp)
} }
} }
...@@ -58,20 +58,20 @@ var servicesCname = []*msg.Service{ ...@@ -58,20 +58,20 @@ var servicesCname = []*msg.Service{
{Host: "10.240.0.1", Key: "endpoint.region2.skydns.test."}, {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, Qname: "a.server1.dev.region1.skydns.test.", Qtype: dns.TypeSRV,
Answer: []dns.RR{ 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{ Extra: []dns.RR{
coretest.CNAME("cname1.region2.skydns.test. 300 IN CNAME cname2.region2.skydns.test."), test.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."), test.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."), test.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."), test.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."), test.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."), test.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.A("endpoint.region2.skydns.test. 300 IN A 10.240.0.1"),
}, },
}, },
} }
middleware/etcd/group_test.go
View file @ 4829b40e
...@@ -12,7 +12,7 @@ import ( ...@@ -12,7 +12,7 @@ import (
"github.com/miekg/coredns/middleware" "github.com/miekg/coredns/middleware"
"github.com/miekg/coredns/middleware/etcd/msg" "github.com/miekg/coredns/middleware/etcd/msg"
coretest "github.com/miekg/coredns/middleware/testing" "github.com/miekg/coredns/middleware/test"
"github.com/miekg/dns" "github.com/miekg/dns"
) )
...@@ -25,7 +25,7 @@ func TestGroupLookup(t *testing.T) { ...@@ -25,7 +25,7 @@ func TestGroupLookup(t *testing.T) {
for _, tc := range dnsTestCasesGroup { for _, tc := range dnsTestCasesGroup {
m := tc.Msg() m := tc.Msg()
rec := middleware.NewResponseRecorder(&coretest.ResponseWriter{}) rec := middleware.NewResponseRecorder(&test.ResponseWriter{})
_, err := etc.ServeDNS(ctx, rec, m) _, err := etc.ServeDNS(ctx, rec, m)
if err != nil { if err != nil {
t.Errorf("expected no error, got %v\n", err) t.Errorf("expected no error, got %v\n", err)
...@@ -33,21 +33,21 @@ func TestGroupLookup(t *testing.T) { ...@@ -33,21 +33,21 @@ func TestGroupLookup(t *testing.T) {
} }
resp := rec.Msg() resp := rec.Msg()
sort.Sort(coretest.RRSet(resp.Answer)) sort.Sort(test.RRSet(resp.Answer))
sort.Sort(coretest.RRSet(resp.Ns)) sort.Sort(test.RRSet(resp.Ns))
sort.Sort(coretest.RRSet(resp.Extra)) sort.Sort(test.RRSet(resp.Extra))
if !coretest.Header(t, tc, resp) { if !test.Header(t, tc, resp) {
t.Logf("%v\n", resp) t.Logf("%v\n", resp)
continue continue
} }
if !coretest.Section(t, tc, coretest.Answer, resp.Answer) { if !test.Section(t, tc, coretest.Answer, resp.Answer) {
t.Logf("%v\n", resp) 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) 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) t.Logf("%v\n", resp)
} }
} }
...@@ -65,29 +65,29 @@ var servicesGroup = []*msg.Service{ ...@@ -65,29 +65,29 @@ var servicesGroup = []*msg.Service{
{Host: "127.0.0.2", Key: "b.sub.dom1.skydns.test.", Group: "g2"}, {Host: "127.0.0.2", Key: "b.sub.dom1.skydns.test.", Group: "g2"},
} }
var dnsTestCasesGroup = []coretest.Case{ var dnsTestCasesGroup = []test.Case{
// Groups // Groups
{ {
// hits the group 'g1' and only includes those records // hits the group 'g1' and only includes those records
Qname: "dom.skydns.test.", Qtype: dns.TypeA, Qname: "dom.skydns.test.", Qtype: dns.TypeA,
Answer: []dns.RR{ Answer: []dns.RR{
coretest.A("dom.skydns.test. 300 IN A 127.0.0.1"), test.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.2"),
}, },
}, },
{ {
// One has group, the other has not... Include the non-group always. // One has group, the other has not... Include the non-group always.
Qname: "dom2.skydns.test.", Qtype: dns.TypeA, Qname: "dom2.skydns.test.", Qtype: dns.TypeA,
Answer: []dns.RR{ Answer: []dns.RR{
coretest.A("dom2.skydns.test. 300 IN A 127.0.0.1"), test.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.2"),
}, },
}, },
{ {
// The groups differ. // The groups differ.
Qname: "dom1.skydns.test.", Qtype: dns.TypeA, Qname: "dom1.skydns.test.", Qtype: dns.TypeA,
Answer: []dns.RR{ 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"),
}, },
}, },
} }
middleware/etcd/multi_test.go
View file @ 4829b40e
...@@ -11,7 +11,7 @@ import ( ...@@ -11,7 +11,7 @@ import (
"github.com/miekg/coredns/middleware" "github.com/miekg/coredns/middleware"
"github.com/miekg/coredns/middleware/etcd/msg" "github.com/miekg/coredns/middleware/etcd/msg"
coretest "github.com/miekg/coredns/middleware/testing" "github.com/miekg/coredns/middleware/test"
"github.com/miekg/dns" "github.com/miekg/dns"
) )
...@@ -19,7 +19,7 @@ import ( ...@@ -19,7 +19,7 @@ import (
func TestMultiLookup(t *testing.T) { func TestMultiLookup(t *testing.T) {
etcMulti := etc etcMulti := etc
etcMulti.Zones = []string{"skydns.test.", "miek.nl."} etcMulti.Zones = []string{"skydns.test.", "miek.nl."}
etcMulti.Next = coretest.ErrorHandler() etcMulti.Next = test.ErrorHandler()
for _, serv := range servicesMulti { for _, serv := range servicesMulti {
set(t, etcMulti, serv.Key, 0, serv) set(t, etcMulti, serv.Key, 0, serv)
...@@ -28,7 +28,7 @@ func TestMultiLookup(t *testing.T) { ...@@ -28,7 +28,7 @@ func TestMultiLookup(t *testing.T) {
for _, tc := range dnsTestCasesMulti { for _, tc := range dnsTestCasesMulti {
m := tc.Msg() m := tc.Msg()
rec := middleware.NewResponseRecorder(&coretest.ResponseWriter{}) rec := middleware.NewResponseRecorder(&test.ResponseWriter{})
_, err := etcMulti.ServeDNS(ctx, rec, m) _, err := etcMulti.ServeDNS(ctx, rec, m)
if err != nil { if err != nil {
t.Errorf("expected no error, got %v\n", err) t.Errorf("expected no error, got %v\n", err)
...@@ -36,21 +36,21 @@ func TestMultiLookup(t *testing.T) { ...@@ -36,21 +36,21 @@ func TestMultiLookup(t *testing.T) {
} }
resp := rec.Msg() resp := rec.Msg()
sort.Sort(coretest.RRSet(resp.Answer)) sort.Sort(test.RRSet(resp.Answer))
sort.Sort(coretest.RRSet(resp.Ns)) sort.Sort(test.RRSet(resp.Ns))
sort.Sort(coretest.RRSet(resp.Extra)) sort.Sort(test.RRSet(resp.Extra))
if !coretest.Header(t, tc, resp) { if !test.Header(t, tc, resp) {
t.Logf("%v\n", resp) t.Logf("%v\n", resp)
continue continue
} }
if !coretest.Section(t, tc, coretest.Answer, resp.Answer) { if !test.Section(t, tc, coretest.Answer, resp.Answer) {
t.Logf("%v\n", resp) 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) 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) t.Logf("%v\n", resp)
} }
} }
...@@ -63,14 +63,14 @@ var servicesMulti = []*msg.Service{ ...@@ -63,14 +63,14 @@ var servicesMulti = []*msg.Service{
{Host: "dev.server1", Port: 8080, Key: "a.server1.dev.region1.example.org."}, {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, 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, 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, Qname: "a.server1.dev.region1.example.org.", Qtype: dns.TypeSRV, Rcode: dns.RcodeServerFailure,
......
middleware/etcd/other_test.go
View file @ 4829b40e
...@@ -14,7 +14,7 @@ import ( ...@@ -14,7 +14,7 @@ import (
"github.com/miekg/coredns/middleware" "github.com/miekg/coredns/middleware"
"github.com/miekg/coredns/middleware/etcd/msg" "github.com/miekg/coredns/middleware/etcd/msg"
coretest "github.com/miekg/coredns/middleware/testing" "github.com/miekg/coredns/middleware/test"
"github.com/miekg/dns" "github.com/miekg/dns"
) )
...@@ -27,7 +27,7 @@ func TestOtherLookup(t *testing.T) { ...@@ -27,7 +27,7 @@ func TestOtherLookup(t *testing.T) {
for _, tc := range dnsTestCasesOther { for _, tc := range dnsTestCasesOther {
m := tc.Msg() m := tc.Msg()
rec := middleware.NewResponseRecorder(&coretest.ResponseWriter{}) rec := middleware.NewResponseRecorder(&test.ResponseWriter{})
_, err := etc.ServeDNS(ctx, rec, m) _, err := etc.ServeDNS(ctx, rec, m)
if err != nil { if err != nil {
t.Errorf("expected no error, got %v\n", err) t.Errorf("expected no error, got %v\n", err)
...@@ -35,21 +35,21 @@ func TestOtherLookup(t *testing.T) { ...@@ -35,21 +35,21 @@ func TestOtherLookup(t *testing.T) {
} }
resp := rec.Msg() resp := rec.Msg()
sort.Sort(coretest.RRSet(resp.Answer)) sort.Sort(test.RRSet(resp.Answer))
sort.Sort(coretest.RRSet(resp.Ns)) sort.Sort(test.RRSet(resp.Ns))
sort.Sort(coretest.RRSet(resp.Extra)) sort.Sort(test.RRSet(resp.Extra))
if !coretest.Header(t, tc, resp) { if !test.Header(t, tc, resp) {
t.Logf("%v\n", resp) t.Logf("%v\n", resp)
continue continue
} }
if !coretest.Section(t, tc, coretest.Answer, resp.Answer) { if !test.Section(t, tc, coretest.Answer, resp.Answer) {
t.Logf("%v\n", resp) 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) 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) t.Logf("%v\n", resp)
} }
} }
...@@ -79,57 +79,57 @@ var servicesOther = []*msg.Service{ ...@@ -79,57 +79,57 @@ var servicesOther = []*msg.Service{
{Host: "10.11.11.10", Key: "https.multiport.http.skydns.test.", Port: 443}, {Host: "10.11.11.10", Key: "https.multiport.http.skydns.test.", Port: 443},
} }
var dnsTestCasesOther = []coretest.Case{ var dnsTestCasesOther = []test.Case{
// MX Tests // MX Tests
{ {
// NODATA as this is not an Mail: true record. // NODATA as this is not an Mail: true record.
Qname: "a.server1.dev.region1.skydns.test.", Qtype: dns.TypeMX, Qname: "a.server1.dev.region1.skydns.test.", Qtype: dns.TypeMX,
Ns: []dns.RR{ 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, 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{ Extra: []dns.RR{
coretest.A("a.ipaddr.skydns.test. 300 IN A 172.16.1.1"), test.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.CNAME("mx.skydns.test. 300 IN CNAME a.ipaddr.skydns.test."),
}, },
}, },
{ {
Qname: "mx2.skydns.test.", Qtype: dns.TypeMX, Qname: "mx2.skydns.test.", Qtype: dns.TypeMX,
Answer: []dns.RR{ Answer: []dns.RR{
coretest.MX("mx2.skydns.test. 300 IN MX 10 a.ipaddr.skydns.test."), test.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 b.ipaddr.skydns.test."),
}, },
Extra: []dns.RR{ Extra: []dns.RR{
coretest.A("a.ipaddr.skydns.test. 300 A 172.16.1.1"), test.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("b.ipaddr.skydns.test. 300 A 172.16.1.2"),
}, },
}, },
// Txt // Txt
{ {
Qname: "a1.txt.skydns.test.", Qtype: dns.TypeTXT, Qname: "a1.txt.skydns.test.", Qtype: dns.TypeTXT,
Answer: []dns.RR{ 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, Qname: "a2.txt.skydns.test.", Qtype: dns.TypeTXT,
Answer: []dns.RR{ 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, Qname: "txt.skydns.test.", Qtype: dns.TypeTXT,
Answer: []dns.RR{ Answer: []dns.RR{
coretest.TXT("txt.skydns.test. 300 IN TXT \"abc abc\""), test.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\""),
}, },
}, },
// Duplicate IP address test // Duplicate IP address test
{ {
Qname: "multiport.http.skydns.test.", Qtype: dns.TypeA, 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")},
}, },
} }
middleware/etcd/setup_test.go
View file @ 4829b40e
...@@ -15,7 +15,7 @@ import ( ...@@ -15,7 +15,7 @@ import (
"github.com/miekg/coredns/middleware/etcd/msg" "github.com/miekg/coredns/middleware/etcd/msg"
"github.com/miekg/coredns/middleware/etcd/singleflight" "github.com/miekg/coredns/middleware/etcd/singleflight"
"github.com/miekg/coredns/middleware/proxy" "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" etcdc "github.com/coreos/etcd/client"
"golang.org/x/net/context" "golang.org/x/net/context"
...@@ -66,7 +66,7 @@ func TestLookup(t *testing.T) { ...@@ -66,7 +66,7 @@ func TestLookup(t *testing.T) {
for _, tc := range dnsTestCases { for _, tc := range dnsTestCases {
m := tc.Msg() m := tc.Msg()
rec := middleware.NewResponseRecorder(&coretest.ResponseWriter{}) rec := middleware.NewResponseRecorder(&test.ResponseWriter{})
_, err := etc.ServeDNS(ctx, rec, m) _, err := etc.ServeDNS(ctx, rec, m)
if err != nil { if err != nil {
t.Errorf("expected no error, got %v\n", err) t.Errorf("expected no error, got %v\n", err)
...@@ -74,21 +74,21 @@ func TestLookup(t *testing.T) { ...@@ -74,21 +74,21 @@ func TestLookup(t *testing.T) {
} }
resp := rec.Msg() resp := rec.Msg()
sort.Sort(coretest.RRSet(resp.Answer)) sort.Sort(test.RRSet(resp.Answer))
sort.Sort(coretest.RRSet(resp.Ns)) sort.Sort(test.RRSet(resp.Ns))
sort.Sort(coretest.RRSet(resp.Extra)) sort.Sort(test.RRSet(resp.Extra))
if !coretest.Header(t, tc, resp) { if !test.Header(t, tc, resp) {
t.Logf("%v\n", resp) t.Logf("%v\n", resp)
continue continue
} }
if !coretest.Section(t, tc, coretest.Answer, resp.Answer) { if !test.Section(t, tc, coretest.Answer, resp.Answer) {
t.Logf("%v\n", resp) 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) 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) t.Logf("%v\n", resp)
} }
} }
......
middleware/file/dnssec_test.go
View file @ 4829b40e
This diff is collapsed.
middleware/file/ent_test.go
View file @ 4829b40e
...@@ -6,28 +6,28 @@ import ( ...@@ -6,28 +6,28 @@ import (
"testing" "testing"
"github.com/miekg/coredns/middleware" "github.com/miekg/coredns/middleware"
coretest "github.com/miekg/coredns/middleware/testing" "github.com/miekg/coredns/middleware/test"
"github.com/miekg/dns" "github.com/miekg/dns"
"golang.org/x/net/context" "golang.org/x/net/context"
) )
var entTestCases = []coretest.Case{ var entTestCases = []test.Case{
{ {
Qname: "b.c.miek.nl.", Qtype: dns.TypeA, Qname: "b.c.miek.nl.", Qtype: dns.TypeA,
Ns: []dns.RR{ Ns: []dns.RR{
coretest.SOA("miek.nl. 1800 IN SOA linode.atoom.net. miek.miek.nl. 1282630057 14400 3600 604800 14400"), test.SOA("miek.nl. 1800 IN SOA linode.atoom.net. miek.miek.nl. 1282630057 14400 3600 604800 14400"),
}, },
}, },
{ {
Qname: "b.c.miek.nl.", Qtype: dns.TypeA, Do: true, Qname: "b.c.miek.nl.", Qtype: dns.TypeA, Do: true,
Ns: []dns.RR{ Ns: []dns.RR{
coretest.NSEC("a.miek.nl. 14400 IN NSEC a.b.c.miek.nl. A RRSIG NSEC"), test.NSEC("a.miek.nl. 14400 IN NSEC a.b.c.miek.nl. A RRSIG NSEC"),
coretest.RRSIG("a.miek.nl. 14400 IN RRSIG NSEC 8 3 14400 20160502144311 20160402144311 12051 miek.nl. d5XZEy6SUpq98ZKUlzqhAfkLI9pQPc="), test.RRSIG("a.miek.nl. 14400 IN RRSIG NSEC 8 3 14400 20160502144311 20160402144311 12051 miek.nl. d5XZEy6SUpq98ZKUlzqhAfkLI9pQPc="),
coretest.RRSIG("miek.nl. 1800 IN RRSIG SOA 8 2 1800 20160502144311 20160402144311 12051 miek.nl. KegoBxA3Tbrhlc4cEdkRiteIkOfsq"), test.RRSIG("miek.nl. 1800 IN RRSIG SOA 8 2 1800 20160502144311 20160402144311 12051 miek.nl. KegoBxA3Tbrhlc4cEdkRiteIkOfsq"),
coretest.SOA("miek.nl. 1800 IN SOA linode.atoom.net. miek.miek.nl. 1282630057 14400 3600 604800 14400"), test.SOA("miek.nl. 1800 IN SOA linode.atoom.net. miek.miek.nl. 1282630057 14400 3600 604800 14400"),
}, },
Extra: []dns.RR{coretest.OPT(4096, true)}, Extra: []dns.RR{test.OPT(4096, true)},
}, },
} }
...@@ -37,13 +37,13 @@ func TestLookupENT(t *testing.T) { ...@@ -37,13 +37,13 @@ func TestLookupENT(t *testing.T) {
t.Fatalf("expect no error when reading zone, got %q", err) t.Fatalf("expect no error when reading zone, got %q", err)
} }
fm := File{Next: coretest.ErrorHandler(), Zones: Zones{Z: map[string]*Zone{testzone: zone}, Names: []string{testzone}}} fm := File{Next: test.ErrorHandler(), Zones: Zones{Z: map[string]*Zone{testzone: zone}, Names: []string{testzone}}}
ctx := context.TODO() ctx := context.TODO()
for _, tc := range entTestCases { for _, tc := range entTestCases {
m := tc.Msg() m := tc.Msg()
rec := middleware.NewResponseRecorder(&coretest.ResponseWriter{}) rec := middleware.NewResponseRecorder(&test.ResponseWriter{})
_, err := fm.ServeDNS(ctx, rec, m) _, err := fm.ServeDNS(ctx, rec, m)
if err != nil { if err != nil {
t.Errorf("expected no error, got %v\n", err) t.Errorf("expected no error, got %v\n", err)
...@@ -51,23 +51,23 @@ func TestLookupENT(t *testing.T) { ...@@ -51,23 +51,23 @@ func TestLookupENT(t *testing.T) {
} }
resp := rec.Msg() resp := rec.Msg()
sort.Sort(coretest.RRSet(resp.Answer)) sort.Sort(test.RRSet(resp.Answer))
sort.Sort(coretest.RRSet(resp.Ns)) sort.Sort(test.RRSet(resp.Ns))
sort.Sort(coretest.RRSet(resp.Extra)) sort.Sort(test.RRSet(resp.Extra))
if !coretest.Header(t, tc, resp) { if !test.Header(t, tc, resp) {
t.Logf("%v\n", resp) t.Logf("%v\n", resp)
continue continue
} }
if !coretest.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 !coretest.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 !coretest.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/file/lookup_test.go
View file @ 4829b40e
...@@ -6,56 +6,56 @@ import ( ...@@ -6,56 +6,56 @@ import (
"testing" "testing"
"github.com/miekg/coredns/middleware" "github.com/miekg/coredns/middleware"
coretest "github.com/miekg/coredns/middleware/testing" "github.com/miekg/coredns/middleware/test"
"github.com/miekg/dns" "github.com/miekg/dns"
"golang.org/x/net/context" "golang.org/x/net/context"
) )
var dnsTestCases = []coretest.Case{ var dnsTestCases = []test.Case{
{ {
Qname: "www.miek.nl.", Qtype: dns.TypeA, Qname: "www.miek.nl.", Qtype: dns.TypeA,
Answer: []dns.RR{ Answer: []dns.RR{
coretest.CNAME("www.miek.nl. 1800 IN CNAME a.miek.nl."), test.CNAME("www.miek.nl. 1800 IN CNAME a.miek.nl."),
}, },
Extra: []dns.RR{ Extra: []dns.RR{
coretest.A("a.miek.nl. 1800 IN A 139.162.196.78"), test.A("a.miek.nl. 1800 IN A 139.162.196.78"),
}, },
}, },
{ {
Qname: "miek.nl.", Qtype: dns.TypeSOA, Qname: "miek.nl.", Qtype: dns.TypeSOA,
Answer: []dns.RR{ Answer: []dns.RR{
coretest.SOA("miek.nl. 1800 IN SOA linode.atoom.net. miek.miek.nl. 1282630057 14400 3600 604800 14400"), test.SOA("miek.nl. 1800 IN SOA linode.atoom.net. miek.miek.nl. 1282630057 14400 3600 604800 14400"),
}, },
}, },
{ {
Qname: "miek.nl.", Qtype: dns.TypeAAAA, Qname: "miek.nl.", Qtype: dns.TypeAAAA,
Answer: []dns.RR{ Answer: []dns.RR{
coretest.AAAA("miek.nl. 1800 IN AAAA 2a01:7e00::f03c:91ff:fef1:6735"), test.AAAA("miek.nl. 1800 IN AAAA 2a01:7e00::f03c:91ff:fef1:6735"),
}, },
}, },
{ {
Qname: "miek.nl.", Qtype: dns.TypeMX, Qname: "miek.nl.", Qtype: dns.TypeMX,
Answer: []dns.RR{ Answer: []dns.RR{
coretest.MX("miek.nl. 1800 IN MX 1 aspmx.l.google.com."), test.MX("miek.nl. 1800 IN MX 1 aspmx.l.google.com."),
coretest.MX("miek.nl. 1800 IN MX 10 aspmx2.googlemail.com."), test.MX("miek.nl. 1800 IN MX 10 aspmx2.googlemail.com."),
coretest.MX("miek.nl. 1800 IN MX 10 aspmx3.googlemail.com."), test.MX("miek.nl. 1800 IN MX 10 aspmx3.googlemail.com."),
coretest.MX("miek.nl. 1800 IN MX 5 alt1.aspmx.l.google.com."), test.MX("miek.nl. 1800 IN MX 5 alt1.aspmx.l.google.com."),
coretest.MX("miek.nl. 1800 IN MX 5 alt2.aspmx.l.google.com."), test.MX("miek.nl. 1800 IN MX 5 alt2.aspmx.l.google.com."),
}, },
}, },
{ {
Qname: "a.miek.nl.", Qtype: dns.TypeSRV, Qname: "a.miek.nl.", Qtype: dns.TypeSRV,
Ns: []dns.RR{ Ns: []dns.RR{
coretest.SOA("miek.nl. 1800 IN SOA linode.atoom.net. miek.miek.nl. 1282630057 14400 3600 604800 14400"), test.SOA("miek.nl. 1800 IN SOA linode.atoom.net. miek.miek.nl. 1282630057 14400 3600 604800 14400"),
}, },
}, },
{ {
Qname: "b.miek.nl.", Qtype: dns.TypeA, Qname: "b.miek.nl.", Qtype: dns.TypeA,
Rcode: dns.RcodeNameError, Rcode: dns.RcodeNameError,
Ns: []dns.RR{ Ns: []dns.RR{
coretest.SOA("miek.nl. 1800 IN SOA linode.atoom.net. miek.miek.nl. 1282630057 14400 3600 604800 14400"), test.SOA("miek.nl. 1800 IN SOA linode.atoom.net. miek.miek.nl. 1282630057 14400 3600 604800 14400"),
}, },
}, },
} }
...@@ -71,13 +71,13 @@ func TestLookup(t *testing.T) { ...@@ -71,13 +71,13 @@ func TestLookup(t *testing.T) {
t.Fatalf("expect no error when reading zone, got %q", err) t.Fatalf("expect no error when reading zone, got %q", err)
} }
fm := File{Next: coretest.ErrorHandler(), Zones: Zones{Z: map[string]*Zone{testzone: zone}, Names: []string{testzone}}} fm := File{Next: test.ErrorHandler(), Zones: Zones{Z: map[string]*Zone{testzone: zone}, Names: []string{testzone}}}
ctx := context.TODO() ctx := context.TODO()
for _, tc := range dnsTestCases { for _, tc := range dnsTestCases {
m := tc.Msg() m := tc.Msg()
rec := middleware.NewResponseRecorder(&coretest.ResponseWriter{}) rec := middleware.NewResponseRecorder(&test.ResponseWriter{})
_, err := fm.ServeDNS(ctx, rec, m) _, err := fm.ServeDNS(ctx, rec, m)
if err != nil { if err != nil {
t.Errorf("expected no error, got %v\n", err) t.Errorf("expected no error, got %v\n", err)
...@@ -85,34 +85,34 @@ func TestLookup(t *testing.T) { ...@@ -85,34 +85,34 @@ func TestLookup(t *testing.T) {
} }
resp := rec.Msg() resp := rec.Msg()
sort.Sort(coretest.RRSet(resp.Answer)) sort.Sort(test.RRSet(resp.Answer))
sort.Sort(coretest.RRSet(resp.Ns)) sort.Sort(test.RRSet(resp.Ns))
sort.Sort(coretest.RRSet(resp.Extra)) sort.Sort(test.RRSet(resp.Extra))
if !coretest.Header(t, tc, resp) { if !test.Header(t, tc, resp) {
t.Logf("%v\n", resp) t.Logf("%v\n", resp)
continue continue
} }
if !coretest.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 !coretest.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 !coretest.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)
} }
} }
} }
func TestLookupNil(t *testing.T) { func TestLookupNil(t *testing.T) {
fm := File{Next: coretest.ErrorHandler(), Zones: Zones{Z: map[string]*Zone{testzone: nil}, Names: []string{testzone}}} fm := File{Next: test.ErrorHandler(), Zones: Zones{Z: map[string]*Zone{testzone: nil}, Names: []string{testzone}}}
ctx := context.TODO() ctx := context.TODO()
m := dnsTestCases[0].Msg() m := dnsTestCases[0].Msg()
rec := middleware.NewResponseRecorder(&coretest.ResponseWriter{}) rec := middleware.NewResponseRecorder(&test.ResponseWriter{})
fm.ServeDNS(ctx, rec, m) fm.ServeDNS(ctx, rec, m)
} }
...@@ -122,18 +122,18 @@ func BenchmarkLookup(b *testing.B) { ...@@ -122,18 +122,18 @@ func BenchmarkLookup(b *testing.B) {
return return
} }
fm := File{Next: coretest.ErrorHandler(), Zones: Zones{Z: map[string]*Zone{testzone: zone}, Names: []string{testzone}}} fm := File{Next: test.ErrorHandler(), Zones: Zones{Z: map[string]*Zone{testzone: zone}, Names: []string{testzone}}}
ctx := context.TODO() ctx := context.TODO()
rec := middleware.NewResponseRecorder(&coretest.ResponseWriter{}) rec := middleware.NewResponseRecorder(&test.ResponseWriter{})
tc := coretest.Case{ tc := test.Case{
Qname: "www.miek.nl.", Qtype: dns.TypeA, Qname: "www.miek.nl.", Qtype: dns.TypeA,
Answer: []dns.RR{ Answer: []dns.RR{
coretest.CNAME("www.miek.nl. 1800 IN CNAME a.miek.nl."), test.CNAME("www.miek.nl. 1800 IN CNAME a.miek.nl."),
}, },
Extra: []dns.RR{ Extra: []dns.RR{
coretest.A("a.miek.nl. 1800 IN A 139.162.196.78"), test.A("a.miek.nl. 1800 IN A 139.162.196.78"),
}, },
} }
......
middleware/file/secondary_test.go
View file @ 4829b40e
...@@ -5,7 +5,7 @@ import ( ...@@ -5,7 +5,7 @@ import (
"testing" "testing"
"github.com/miekg/coredns/middleware" "github.com/miekg/coredns/middleware"
coretest "github.com/miekg/coredns/middleware/testing" "github.com/miekg/coredns/middleware/test"
"github.com/miekg/dns" "github.com/miekg/dns"
) )
...@@ -46,14 +46,14 @@ func (s *soa) Handler(w dns.ResponseWriter, req *dns.Msg) { ...@@ -46,14 +46,14 @@ func (s *soa) Handler(w dns.ResponseWriter, req *dns.Msg) {
switch req.Question[0].Qtype { switch req.Question[0].Qtype {
case dns.TypeSOA: case dns.TypeSOA:
m.Answer = make([]dns.RR, 1) m.Answer = make([]dns.RR, 1)
m.Answer[0] = coretest.SOA(fmt.Sprintf("%s IN SOA bla. bla. %d 0 0 0 0 ", testZone, s.serial)) m.Answer[0] = test.SOA(fmt.Sprintf("%s IN SOA bla. bla. %d 0 0 0 0 ", testZone, s.serial))
w.WriteMsg(m) w.WriteMsg(m)
case dns.TypeAXFR: case dns.TypeAXFR:
m.Answer = make([]dns.RR, 4) m.Answer = make([]dns.RR, 4)
m.Answer[0] = coretest.SOA(fmt.Sprintf("%s IN SOA bla. bla. %d 0 0 0 0 ", testZone, s.serial)) m.Answer[0] = test.SOA(fmt.Sprintf("%s IN SOA bla. bla. %d 0 0 0 0 ", testZone, s.serial))
m.Answer[1] = coretest.A(fmt.Sprintf("%s IN A 127.0.0.1", testZone)) m.Answer[1] = test.A(fmt.Sprintf("%s IN A 127.0.0.1", testZone))
m.Answer[2] = coretest.A(fmt.Sprintf("%s IN A 127.0.0.1", testZone)) m.Answer[2] = test.A(fmt.Sprintf("%s IN A 127.0.0.1", testZone))
m.Answer[3] = coretest.SOA(fmt.Sprintf("%s IN SOA bla. bla. %d 0 0 0 0 ", testZone, s.serial)) m.Answer[3] = test.SOA(fmt.Sprintf("%s IN SOA bla. bla. %d 0 0 0 0 ", testZone, s.serial))
w.WriteMsg(m) w.WriteMsg(m)
} }
} }
...@@ -62,7 +62,7 @@ func (s *soa) TransferHandler(w dns.ResponseWriter, req *dns.Msg) { ...@@ -62,7 +62,7 @@ func (s *soa) TransferHandler(w dns.ResponseWriter, req *dns.Msg) {
m := new(dns.Msg) m := new(dns.Msg)
m.SetReply(req) m.SetReply(req)
m.Answer = make([]dns.RR, 1) m.Answer = make([]dns.RR, 1)
m.Answer[0] = coretest.SOA(fmt.Sprintf("%s IN SOA bla. bla. %d 0 0 0 0 ", testZone, s.serial)) m.Answer[0] = test.SOA(fmt.Sprintf("%s IN SOA bla. bla. %d 0 0 0 0 ", testZone, s.serial))
w.WriteMsg(m) w.WriteMsg(m)
} }
...@@ -74,7 +74,7 @@ func TestShouldTransfer(t *testing.T) { ...@@ -74,7 +74,7 @@ func TestShouldTransfer(t *testing.T) {
dns.HandleFunc(testZone, soa.Handler) dns.HandleFunc(testZone, soa.Handler)
defer dns.HandleRemove(testZone) defer dns.HandleRemove(testZone)
s, addrstr, err := coretest.TCPServer("127.0.0.1:0") s, addrstr, err := test.TCPServer("127.0.0.1:0")
if err != nil { if err != nil {
t.Fatalf("unable to run test server: %v", err) t.Fatalf("unable to run test server: %v", err)
} }
...@@ -85,7 +85,7 @@ func TestShouldTransfer(t *testing.T) { ...@@ -85,7 +85,7 @@ func TestShouldTransfer(t *testing.T) {
z.TransferFrom = []string{addrstr} z.TransferFrom = []string{addrstr}
// Serial smaller // Serial smaller
z.SOA = coretest.SOA(fmt.Sprintf("%s IN SOA bla. bla. %d 0 0 0 0 ", testZone, soa.serial-1)) z.SOA = test.SOA(fmt.Sprintf("%s IN SOA bla. bla. %d 0 0 0 0 ", testZone, soa.serial-1))
should, err := z.shouldTransfer() should, err := z.shouldTransfer()
if err != nil { if err != nil {
t.Fatalf("unable to run shouldTransfer: %v", err) t.Fatalf("unable to run shouldTransfer: %v", err)
...@@ -94,7 +94,7 @@ func TestShouldTransfer(t *testing.T) { ...@@ -94,7 +94,7 @@ func TestShouldTransfer(t *testing.T) {
t.Fatalf("shouldTransfer should return true for serial: %q", soa.serial-1) t.Fatalf("shouldTransfer should return true for serial: %q", soa.serial-1)
} }
// Serial equal // Serial equal
z.SOA = coretest.SOA(fmt.Sprintf("%s IN SOA bla. bla. %d 0 0 0 0 ", testZone, soa.serial)) z.SOA = test.SOA(fmt.Sprintf("%s IN SOA bla. bla. %d 0 0 0 0 ", testZone, soa.serial))
should, err = z.shouldTransfer() should, err = z.shouldTransfer()
if err != nil { if err != nil {
t.Fatalf("unable to run shouldTransfer: %v", err) t.Fatalf("unable to run shouldTransfer: %v", err)
...@@ -110,7 +110,7 @@ func TestTransferIn(t *testing.T) { ...@@ -110,7 +110,7 @@ func TestTransferIn(t *testing.T) {
dns.HandleFunc(testZone, soa.Handler) dns.HandleFunc(testZone, soa.Handler)
defer dns.HandleRemove(testZone) defer dns.HandleRemove(testZone)
s, addrstr, err := coretest.TCPServer("127.0.0.1:0") s, addrstr, err := test.TCPServer("127.0.0.1:0")
if err != nil { if err != nil {
t.Fatalf("unable to run test server: %v", err) t.Fatalf("unable to run test server: %v", err)
} }
...@@ -152,5 +152,5 @@ func NewState(zone string, qtype uint16) middleware.State { ...@@ -152,5 +152,5 @@ func NewState(zone string, qtype uint16) middleware.State {
m := new(dns.Msg) m := new(dns.Msg)
m.SetQuestion("example.com.", dns.TypeA) m.SetQuestion("example.com.", dns.TypeA)
m.SetEdns0(4097, true) m.SetEdns0(4097, true)
return middleware.State{W: &coretest.ResponseWriter{}, Req: m} return middleware.State{W: &test.ResponseWriter{}, Req: m}
} }
middleware/file/wildcard_test.go
View file @ 4829b40e
...@@ -6,40 +6,40 @@ import ( ...@@ -6,40 +6,40 @@ import (
"testing" "testing"
"github.com/miekg/coredns/middleware" "github.com/miekg/coredns/middleware"
coretest "github.com/miekg/coredns/middleware/testing" "github.com/miekg/coredns/middleware/test"
"github.com/miekg/dns" "github.com/miekg/dns"
"golang.org/x/net/context" "golang.org/x/net/context"
) )
var wildcardTestCases = []coretest.Case{ var wildcardTestCases = []test.Case{
{ {
Qname: "wild.dnssex.nl.", Qtype: dns.TypeTXT, Qname: "wild.dnssex.nl.", Qtype: dns.TypeTXT,
Answer: []dns.RR{ Answer: []dns.RR{
coretest.TXT(`wild.dnssex.nl. 1800 IN TXT "Doing It Safe Is Better"`), test.TXT(`wild.dnssex.nl. 1800 IN TXT "Doing It Safe Is Better"`),
}, },
}, },
{ {
Qname: "wild.dnssex.nl.", Qtype: dns.TypeTXT, Do: true, Qname: "wild.dnssex.nl.", Qtype: dns.TypeTXT, Do: true,
Answer: []dns.RR{ Answer: []dns.RR{
coretest.RRSIG("wild.dnssex.nl. 1800 IN RRSIG TXT 8 2 1800 20160428190224 20160329190224 14460 dnssex.nl. FUZSTyvZfeuuOpCm"), test.RRSIG("wild.dnssex.nl. 1800 IN RRSIG TXT 8 2 1800 20160428190224 20160329190224 14460 dnssex.nl. FUZSTyvZfeuuOpCm"),
coretest.TXT(`wild.dnssex.nl. 1800 IN TXT "Doing It Safe Is Better"`), test.TXT(`wild.dnssex.nl. 1800 IN TXT "Doing It Safe Is Better"`),
}, },
Extra: []dns.RR{coretest.OPT(4096, true)}, Extra: []dns.RR{test.OPT(4096, true)},
}, },
// nodata reponse // nodata reponse
/* /*
{ {
Qname: "wild.dnssex.nl.", Qtype: dns.TypeSRV, Qname: "wild.dnssex.nl.", Qtype: dns.TypeSRV,
Answer: []dns.RR{ Answer: []dns.RR{
coretest.TXT(`wild.dnssex.nl. 1800 IN TXT "Doing It Safe Is Better"`), test.TXT(`wild.dnssex.nl. 1800 IN TXT "Doing It Safe Is Better"`),
}, },
}, },
{ {
Qname: "wild.dnssex.nl.", Qtype: dns.TypeSRV, Do: true, Qname: "wild.dnssex.nl.", Qtype: dns.TypeSRV, Do: true,
Answer: []dns.RR{ Answer: []dns.RR{
coretest.RRSIG("wild.dnssex.nl. 1800 IN RRSIG TXT 8 2 1800 20160428190224 20160329190224 14460 dnssex.nl. FUZSTyvZfeuuOpCm"), test.RRSIG("wild.dnssex.nl. 1800 IN RRSIG TXT 8 2 1800 20160428190224 20160329190224 14460 dnssex.nl. FUZSTyvZfeuuOpCm"),
coretest.TXT(`wild.dnssex.nl. 1800 IN TXT "Doing It Safe Is Better"`), test.TXT(`wild.dnssex.nl. 1800 IN TXT "Doing It Safe Is Better"`),
}, },
}, },
*/ */
...@@ -51,13 +51,13 @@ func TestLookupWildcard(t *testing.T) { ...@@ -51,13 +51,13 @@ func TestLookupWildcard(t *testing.T) {
t.Fatalf("expect no error when reading zone, got %q", err) t.Fatalf("expect no error when reading zone, got %q", err)
} }
fm := File{Next: coretest.ErrorHandler(), Zones: Zones{Z: map[string]*Zone{testzone1: zone}, Names: []string{testzone1}}} fm := File{Next: test.ErrorHandler(), Zones: Zones{Z: map[string]*Zone{testzone1: zone}, Names: []string{testzone1}}}
ctx := context.TODO() ctx := context.TODO()
for _, tc := range wildcardTestCases { for _, tc := range wildcardTestCases {
m := tc.Msg() m := tc.Msg()
rec := middleware.NewResponseRecorder(&coretest.ResponseWriter{}) rec := middleware.NewResponseRecorder(&test.ResponseWriter{})
_, err := fm.ServeDNS(ctx, rec, m) _, err := fm.ServeDNS(ctx, rec, m)
if err != nil { if err != nil {
t.Errorf("expected no error, got %v\n", err) t.Errorf("expected no error, got %v\n", err)
...@@ -65,21 +65,21 @@ func TestLookupWildcard(t *testing.T) { ...@@ -65,21 +65,21 @@ func TestLookupWildcard(t *testing.T) {
} }
resp := rec.Msg() resp := rec.Msg()
sort.Sort(coretest.RRSet(resp.Answer)) sort.Sort(test.RRSet(resp.Answer))
sort.Sort(coretest.RRSet(resp.Ns)) sort.Sort(test.RRSet(resp.Ns))
sort.Sort(coretest.RRSet(resp.Extra)) sort.Sort(test.RRSet(resp.Extra))
if !coretest.Header(t, tc, resp) { if !test.Header(t, tc, resp) {
t.Logf("%v\n", resp) t.Logf("%v\n", resp)
continue continue
} }
if !coretest.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 !coretest.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 !coretest.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/loadbalance/loadbalance_test.go
View file @ 4829b40e
...@@ -4,7 +4,7 @@ import ( ...@@ -4,7 +4,7 @@ import (
"testing" "testing"
"github.com/miekg/coredns/middleware" "github.com/miekg/coredns/middleware"
coretest "github.com/miekg/coredns/middleware/testing" "github.com/miekg/coredns/middleware/test"
"github.com/miekg/dns" "github.com/miekg/dns"
"golang.org/x/net/context" "golang.org/x/net/context"
...@@ -56,7 +56,7 @@ func TestLoadBalance(t *testing.T) { ...@@ -56,7 +56,7 @@ func TestLoadBalance(t *testing.T) {
}, },
} }
rec := middleware.NewResponseRecorder(&coretest.ResponseWriter{}) rec := middleware.NewResponseRecorder(&test.ResponseWriter{})
for i, test := range tests { for i, test := range tests {
req := new(dns.Msg) req := new(dns.Msg)
......
middleware/log/log_test.go
View file @ 4829b40e
...@@ -7,7 +7,7 @@ import ( ...@@ -7,7 +7,7 @@ import (
"testing" "testing"
"github.com/miekg/coredns/middleware" "github.com/miekg/coredns/middleware"
coretest "github.com/miekg/coredns/middleware/testing" "github.com/miekg/coredns/middleware/test"
"github.com/miekg/dns" "github.com/miekg/dns"
"golang.org/x/net/context" "golang.org/x/net/context"
...@@ -37,7 +37,7 @@ func TestLoggedStatus(t *testing.T) { ...@@ -37,7 +37,7 @@ func TestLoggedStatus(t *testing.T) {
r := new(dns.Msg) r := new(dns.Msg)
r.SetQuestion("example.org.", dns.TypeA) r.SetQuestion("example.org.", dns.TypeA)
rec := middleware.NewResponseRecorder(&coretest.ResponseWriter{}) rec := middleware.NewResponseRecorder(&test.ResponseWriter{})
rcode, _ := logger.ServeDNS(ctx, rec, r) rcode, _ := logger.ServeDNS(ctx, rec, r)
if rcode != 0 { if rcode != 0 {
......
middleware/proxy/lookup_test.go
View file @ 4829b40e
...@@ -7,7 +7,7 @@ import ( ...@@ -7,7 +7,7 @@ import (
"testing" "testing"
"github.com/miekg/coredns/middleware" "github.com/miekg/coredns/middleware"
coretest "github.com/miekg/coredns/middleware/testing" "github.com/miekg/coredns/middleware/test"
"github.com/miekg/dns" "github.com/miekg/dns"
) )
...@@ -32,5 +32,5 @@ func TestLookupProxy(t *testing.T) { ...@@ -32,5 +32,5 @@ func TestLookupProxy(t *testing.T) {
} }
func fakeState() middleware.State { func fakeState() middleware.State {
return middleware.State{W: &coretest.ResponseWriter{}, Req: new(dns.Msg)} return middleware.State{W: &test.ResponseWriter{}, Req: new(dns.Msg)}
} }
middleware/rewrite/rewrite_test.go
View file @ 4829b40e
...@@ -4,7 +4,7 @@ import ( ...@@ -4,7 +4,7 @@ import (
"testing" "testing"
"github.com/miekg/coredns/middleware" "github.com/miekg/coredns/middleware"
coretest "github.com/miekg/coredns/middleware/testing" "github.com/miekg/coredns/middleware/test"
"github.com/miekg/dns" "github.com/miekg/dns"
"golang.org/x/net/context" "golang.org/x/net/context"
...@@ -45,23 +45,23 @@ func TestRewrite(t *testing.T) { ...@@ -45,23 +45,23 @@ func TestRewrite(t *testing.T) {
} }
ctx := context.TODO() ctx := context.TODO()
for i, test := range tests { for i, tc := range tests {
m := new(dns.Msg) m := new(dns.Msg)
m.SetQuestion(test.from, test.fromT) m.SetQuestion(tc.from, tc.fromT)
m.Question[0].Qclass = test.fromC m.Question[0].Qclass = tc.fromC
rec := middleware.NewResponseRecorder(&coretest.ResponseWriter{}) rec := middleware.NewResponseRecorder(&test.ResponseWriter{})
rw.ServeDNS(ctx, rec, m) rw.ServeDNS(ctx, rec, m)
resp := rec.Msg() resp := rec.Msg()
if resp.Question[0].Name != test.to { if resp.Question[0].Name != tc.to {
t.Errorf("Test %d: Expected Name to be '%s' but was '%s'", i, test.to, resp.Question[0].Name) t.Errorf("Test %d: Expected Name to be '%s' but was '%s'", i, tc.to, resp.Question[0].Name)
} }
if resp.Question[0].Qtype != test.toT { if resp.Question[0].Qtype != tc.toT {
t.Errorf("Test %d: Expected Type to be '%d' but was '%d'", i, test.toT, resp.Question[0].Qtype) t.Errorf("Test %d: Expected Type to be '%d' but was '%d'", i, tc.toT, resp.Question[0].Qtype)
} }
if resp.Question[0].Qclass != test.toC { if resp.Question[0].Qclass != tc.toC {
t.Errorf("Test %d: Expected Class to be '%d' but was '%d'", i, test.toC, resp.Question[0].Qclass) t.Errorf("Test %d: Expected Class to be '%d' but was '%d'", i, tc.toC, resp.Question[0].Qclass)
} }
} }
......
middleware/state_test.go
View file @ 4829b40e
...@@ -3,7 +3,7 @@ package middleware ...@@ -3,7 +3,7 @@ package middleware
import ( import (
"testing" "testing"
coretest "github.com/miekg/coredns/middleware/testing" "github.com/miekg/coredns/middleware/test"
"github.com/miekg/dns" "github.com/miekg/dns"
) )
...@@ -51,7 +51,7 @@ func testState() State { ...@@ -51,7 +51,7 @@ func testState() State {
m := new(dns.Msg) m := new(dns.Msg)
m.SetQuestion("example.com.", dns.TypeA) m.SetQuestion("example.com.", dns.TypeA)
m.SetEdns0(4097, true) m.SetEdns0(4097, true)
return State{W: &coretest.ResponseWriter{}, Req: m} return State{W: &test.ResponseWriter{}, Req: m}
} }
/* /*
......
middleware/testing/helpers.go → middleware/test/helpers.go
View file @ 4829b40e
package testing package test
import ( import (
"testing" "testing"
......
middleware/testing/responsewriter.go → middleware/test/responsewriter.go
View file @ 4829b40e
package testing package test
import ( import (
"net" "net"
......
middleware/testing/server.go → middleware/test/server.go
View file @ 4829b40e
package testing package test
import ( import (
"net" "net"
......
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