diff options
21 files changed, 261 insertions, 261 deletions
diff --git a/middleware/chaos/chaos_test.go b/middleware/chaos/chaos_test.go index fc7d4845f..f669eaa7c 100644 --- a/middleware/chaos/chaos_test.go +++ b/middleware/chaos/chaos_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/miekg/coredns/middleware" - coretest "github.com/miekg/coredns/middleware/testing" + "github.com/miekg/coredns/middleware/test" "github.com/miekg/dns" "golang.org/x/net/context" @@ -49,28 +49,28 @@ func TestChaos(t *testing.T) { ctx := context.TODO() - for i, test := range tests { + for i, tc := range tests { req := new(dns.Msg) - if test.qtype == 0 { - test.qtype = dns.TypeTXT + if tc.qtype == 0 { + 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 - 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) - if err != test.expectedErr { - t.Errorf("Test %d: Expected error %v, but got %v", i, test.expectedErr, err) + if err != tc.expectedErr { + t.Errorf("Test %d: Expected error %v, but got %v", i, tc.expectedErr, err) } - if code != int(test.expectedCode) { - t.Errorf("Test %d: Expected status code %d, but got %d", i, test.expectedCode, code) + if code != int(tc.expectedCode) { + 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] - if answer != test.expectedReply { - t.Errorf("Test %d: Expected answer %s, but got %s", i, test.expectedReply, answer) + if answer != tc.expectedReply { + t.Errorf("Test %d: Expected answer %s, but got %s", i, tc.expectedReply, answer) } } } diff --git a/middleware/errors/errors.go b/middleware/errors/errors.go index 0639aadbf..8936b8945 100644 --- a/middleware/errors/errors.go +++ b/middleware/errors/errors.go @@ -8,10 +8,10 @@ import ( "strings" "time" - "golang.org/x/net/context" - "github.com/miekg/coredns/middleware" + "github.com/miekg/dns" + "golang.org/x/net/context" ) // ErrorHandler handles DNS errors (and errors from other middleware). diff --git a/middleware/errors/errors_test.go b/middleware/errors/errors_test.go index 00dea1ebb..6885aae0f 100644 --- a/middleware/errors/errors_test.go +++ b/middleware/errors/errors_test.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/miekg/coredns/middleware" - coretest "github.com/miekg/coredns/middleware/testing" + "github.com/miekg/coredns/middleware/test" "github.com/miekg/dns" "golang.org/x/net/context" @@ -44,23 +44,23 @@ func TestErrors(t *testing.T) { req := new(dns.Msg) req.SetQuestion("example.org.", dns.TypeA) - for i, test := range tests { - em.Next = test.next + for i, tc := range tests { + em.Next = tc.next buf.Reset() - rec := middleware.NewResponseRecorder(&coretest.ResponseWriter{}) + rec := middleware.NewResponseRecorder(&test.ResponseWriter{}) 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) + i, tc.expectedErr, err) } - if code != test.expectedCode { + if code != tc.expectedCode { 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", - i, test.expectedLog, log) + i, tc.expectedLog, log) } } } @@ -78,7 +78,7 @@ func TestVisibleErrorWithPanic(t *testing.T) { req := new(dns.Msg) req.SetQuestion("example.org.", dns.TypeA) - rec := middleware.NewResponseRecorder(&coretest.ResponseWriter{}) + rec := middleware.NewResponseRecorder(&test.ResponseWriter{}) code, err := eh.ServeDNS(ctx, rec, req) if code != 0 { diff --git a/middleware/etcd/cname_test.go b/middleware/etcd/cname_test.go index 147498d64..0cec8b7d0 100644 --- a/middleware/etcd/cname_test.go +++ b/middleware/etcd/cname_test.go @@ -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"), }, }, } diff --git a/middleware/etcd/group_test.go b/middleware/etcd/group_test.go index e37159f3f..aa862eb09 100644 --- a/middleware/etcd/group_test.go +++ b/middleware/etcd/group_test.go @@ -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"), }, }, } diff --git a/middleware/etcd/multi_test.go b/middleware/etcd/multi_test.go index 980b17a53..da4909685 100644 --- a/middleware/etcd/multi_test.go +++ b/middleware/etcd/multi_test.go @@ -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, diff --git a/middleware/etcd/other_test.go b/middleware/etcd/other_test.go index ac0db7d3e..1b1b8a334 100644 --- a/middleware/etcd/other_test.go +++ b/middleware/etcd/other_test.go @@ -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")}, }, } diff --git a/middleware/etcd/setup_test.go b/middleware/etcd/setup_test.go index 8fbfd1b5f..0e3a8c30e 100644 --- a/middleware/etcd/setup_test.go +++ b/middleware/etcd/setup_test.go @@ -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) } } diff --git a/middleware/file/dnssec_test.go b/middleware/file/dnssec_test.go index f7e641d7f..12b9f1b08 100644 --- a/middleware/file/dnssec_test.go +++ b/middleware/file/dnssec_test.go @@ -6,102 +6,102 @@ import ( "testing" "github.com/miekg/coredns/middleware" - coretest "github.com/miekg/coredns/middleware/testing" + "github.com/miekg/coredns/middleware/test" "github.com/miekg/dns" "golang.org/x/net/context" ) -var dnssecTestCases = []coretest.Case{ +var dnssecTestCases = []test.Case{ { Qname: "miek.nl.", Qtype: dns.TypeSOA, Do: true, Answer: []dns.RR{ // because we sort, this look fishy, but it is OK. - coretest.RRSIG("miek.nl. 1800 IN RRSIG SOA 8 2 1800 20160426031301 20160327031301 12051 miek.nl. FIrzy07acBbtyQczy1dc="), - coretest.SOA("miek.nl. 1800 IN SOA linode.atoom.net. miek.miek.nl. 1282630057 14400 3600 604800 14400"), + test.RRSIG("miek.nl. 1800 IN RRSIG SOA 8 2 1800 20160426031301 20160327031301 12051 miek.nl. FIrzy07acBbtyQczy1dc="), + 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)}, }, { Qname: "miek.nl.", Qtype: dns.TypeAAAA, Do: true, Answer: []dns.RR{ - coretest.AAAA("miek.nl. 1800 IN AAAA 2a01:7e00::f03c:91ff:fef1:6735"), - coretest.RRSIG("miek.nl. 1800 IN RRSIG AAAA 8 2 1800 20160426031301 20160327031301 12051 miek.nl. SsRT="), + test.AAAA("miek.nl. 1800 IN AAAA 2a01:7e00::f03c:91ff:fef1:6735"), + test.RRSIG("miek.nl. 1800 IN RRSIG AAAA 8 2 1800 20160426031301 20160327031301 12051 miek.nl. SsRT="), }, - Extra: []dns.RR{coretest.OPT(4096, true)}, + Extra: []dns.RR{test.OPT(4096, true)}, }, { Qname: "miek.nl.", Qtype: dns.TypeMX, Do: true, Answer: []dns.RR{ - coretest.MX("miek.nl. 1800 IN MX 1 aspmx.l.google.com."), - coretest.MX("miek.nl. 1800 IN MX 10 aspmx2.googlemail.com."), - coretest.MX("miek.nl. 1800 IN MX 10 aspmx3.googlemail.com."), - coretest.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."), - coretest.RRSIG("miek.nl. 1800 IN RRSIG MX 8 2 1800 20160426031301 20160327031301 12051 miek.nl. kLqG+iOr="), + test.MX("miek.nl. 1800 IN MX 1 aspmx.l.google.com."), + test.MX("miek.nl. 1800 IN MX 10 aspmx2.googlemail.com."), + test.MX("miek.nl. 1800 IN MX 10 aspmx3.googlemail.com."), + test.MX("miek.nl. 1800 IN MX 5 alt1.aspmx.l.google.com."), + test.MX("miek.nl. 1800 IN MX 5 alt2.aspmx.l.google.com."), + test.RRSIG("miek.nl. 1800 IN RRSIG MX 8 2 1800 20160426031301 20160327031301 12051 miek.nl. kLqG+iOr="), }, - Extra: []dns.RR{coretest.OPT(4096, true)}, + Extra: []dns.RR{test.OPT(4096, true)}, }, { Qname: "www.miek.nl.", Qtype: dns.TypeA, Do: true, 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{ - coretest.OPT(4096, true), - coretest.A("a.miek.nl. 1800 IN A 139.162.196.78"), - coretest.RRSIG("a.miek.nl. 1800 IN RRSIG A 8 3 1800 20160426031301 20160327031301 12051 miek.nl. lxLotCjWZ3kihTxk="), + test.OPT(4096, true), + test.A("a.miek.nl. 1800 IN A 139.162.196.78"), + test.RRSIG("a.miek.nl. 1800 IN RRSIG A 8 3 1800 20160426031301 20160327031301 12051 miek.nl. lxLotCjWZ3kihTxk="), }, }, { // NoData Qname: "a.miek.nl.", Qtype: dns.TypeSRV, Do: true, Ns: []dns.RR{ - coretest.NSEC("a.miek.nl. 14400 IN NSEC archive.miek.nl. A AAAA RRSIG NSEC"), - coretest.RRSIG("a.miek.nl. 14400 IN RRSIG NSEC 8 3 14400 20160426031301 20160327031301 12051 miek.nl. GqnF6cutipmSHEao="), - coretest.RRSIG("miek.nl. 1800 IN RRSIG SOA 8 2 1800 20160426031301 20160327031301 12051 miek.nl. FIrzy07acBbtyQczy1dc="), - coretest.SOA("miek.nl. 1800 IN SOA linode.atoom.net. miek.miek.nl. 1282630057 14400 3600 604800 14400"), + test.NSEC("a.miek.nl. 14400 IN NSEC archive.miek.nl. A AAAA RRSIG NSEC"), + test.RRSIG("a.miek.nl. 14400 IN RRSIG NSEC 8 3 14400 20160426031301 20160327031301 12051 miek.nl. GqnF6cutipmSHEao="), + test.RRSIG("miek.nl. 1800 IN RRSIG SOA 8 2 1800 20160426031301 20160327031301 12051 miek.nl. FIrzy07acBbtyQczy1dc="), + 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)}, }, { Qname: "b.miek.nl.", Qtype: dns.TypeA, Do: true, Rcode: dns.RcodeNameError, Ns: []dns.RR{ - coretest.NSEC("archive.miek.nl. 14400 IN NSEC go.dns.miek.nl. CNAME RRSIG NSEC"), - coretest.RRSIG("archive.miek.nl. 14400 IN RRSIG NSEC 8 3 14400 20160426031301 20160327031301 12051 miek.nl. jEpx8lcp4do5fWXg="), - coretest.NSEC("miek.nl. 14400 IN NSEC a.miek.nl. A NS SOA MX AAAA RRSIG NSEC DNSKEY"), - coretest.RRSIG("miek.nl. 14400 IN RRSIG NSEC 8 2 14400 20160426031301 20160327031301 12051 miek.nl. mFfc3r/9PSC1H6oSpdC"), - coretest.RRSIG("miek.nl. 1800 IN RRSIG SOA 8 2 1800 20160426031301 20160327031301 12051 miek.nl. FIrzy07acBbtyQczy1dc="), - coretest.SOA("miek.nl. 1800 IN SOA linode.atoom.net. miek.miek.nl. 1282630057 14400 3600 604800 14400"), + test.NSEC("archive.miek.nl. 14400 IN NSEC go.dns.miek.nl. CNAME RRSIG NSEC"), + test.RRSIG("archive.miek.nl. 14400 IN RRSIG NSEC 8 3 14400 20160426031301 20160327031301 12051 miek.nl. jEpx8lcp4do5fWXg="), + test.NSEC("miek.nl. 14400 IN NSEC a.miek.nl. A NS SOA MX AAAA RRSIG NSEC DNSKEY"), + test.RRSIG("miek.nl. 14400 IN RRSIG NSEC 8 2 14400 20160426031301 20160327031301 12051 miek.nl. mFfc3r/9PSC1H6oSpdC"), + test.RRSIG("miek.nl. 1800 IN RRSIG SOA 8 2 1800 20160426031301 20160327031301 12051 miek.nl. FIrzy07acBbtyQczy1dc="), + 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)}, }, { Qname: "b.blaat.miek.nl.", Qtype: dns.TypeA, Do: true, Rcode: dns.RcodeNameError, Ns: []dns.RR{ - coretest.NSEC("archive.miek.nl. 14400 IN NSEC go.dns.miek.nl. CNAME RRSIG NSEC"), - coretest.RRSIG("archive.miek.nl. 14400 IN RRSIG NSEC 8 3 14400 20160426031301 20160327031301 12051 miek.nl. jEpx8lcp4do5fWXg="), - coretest.NSEC("miek.nl. 14400 IN NSEC a.miek.nl. A NS SOA MX AAAA RRSIG NSEC DNSKEY"), - coretest.RRSIG("miek.nl. 14400 IN RRSIG NSEC 8 2 14400 20160426031301 20160327031301 12051 miek.nl. mFfc3r/9PSC1H6oSpdC"), - coretest.RRSIG("miek.nl. 1800 IN RRSIG SOA 8 2 1800 20160426031301 20160327031301 12051 miek.nl. FIrzy07acBbtyQczy1dc="), - coretest.SOA("miek.nl. 1800 IN SOA linode.atoom.net. miek.miek.nl. 1282630057 14400 3600 604800 14400"), + test.NSEC("archive.miek.nl. 14400 IN NSEC go.dns.miek.nl. CNAME RRSIG NSEC"), + test.RRSIG("archive.miek.nl. 14400 IN RRSIG NSEC 8 3 14400 20160426031301 20160327031301 12051 miek.nl. jEpx8lcp4do5fWXg="), + test.NSEC("miek.nl. 14400 IN NSEC a.miek.nl. A NS SOA MX AAAA RRSIG NSEC DNSKEY"), + test.RRSIG("miek.nl. 14400 IN RRSIG NSEC 8 2 14400 20160426031301 20160327031301 12051 miek.nl. mFfc3r/9PSC1H6oSpdC"), + test.RRSIG("miek.nl. 1800 IN RRSIG SOA 8 2 1800 20160426031301 20160327031301 12051 miek.nl. FIrzy07acBbtyQczy1dc="), + 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)}, }, { Qname: "b.a.miek.nl.", Qtype: dns.TypeA, Do: true, Rcode: dns.RcodeNameError, Ns: []dns.RR{ // dedupped NSEC, because 1 nsec tells all - coretest.NSEC("a.miek.nl. 14400 IN NSEC archive.miek.nl. A AAAA RRSIG NSEC"), - coretest.RRSIG("a.miek.nl. 14400 IN RRSIG NSEC 8 3 14400 20160426031301 20160327031301 12051 miek.nl. GqnF6cut/RRGPQ1QGQE1ipmSHEao="), - coretest.RRSIG("miek.nl. 1800 IN RRSIG SOA 8 2 1800 20160426031301 20160327031301 12051 miek.nl. FIrzy07acBbtyQczy1dc="), - coretest.SOA("miek.nl. 1800 IN SOA linode.atoom.net. miek.miek.nl. 1282630057 14400 3600 604800 14400"), + test.NSEC("a.miek.nl. 14400 IN NSEC archive.miek.nl. A AAAA RRSIG NSEC"), + test.RRSIG("a.miek.nl. 14400 IN RRSIG NSEC 8 3 14400 20160426031301 20160327031301 12051 miek.nl. GqnF6cut/RRGPQ1QGQE1ipmSHEao="), + test.RRSIG("miek.nl. 1800 IN RRSIG SOA 8 2 1800 20160426031301 20160327031301 12051 miek.nl. FIrzy07acBbtyQczy1dc="), + 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)}, }, } @@ -111,13 +111,13 @@ func TestLookupDNSSEC(t *testing.T) { 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() for _, tc := range dnssecTestCases { m := tc.Msg() - rec := middleware.NewResponseRecorder(&coretest.ResponseWriter{}) + rec := middleware.NewResponseRecorder(&test.ResponseWriter{}) _, err := fm.ServeDNS(ctx, rec, m) if err != nil { t.Errorf("expected no error, got %v\n", err) @@ -125,23 +125,23 @@ func TestLookupDNSSEC(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, test.Answer, resp.Answer) { 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) } - if !coretest.Section(t, tc, coretest.Extra, resp.Extra) { + if !test.Section(t, tc, test.Extra, resp.Extra) { t.Logf("%v\n", resp) } } @@ -153,20 +153,20 @@ func BenchmarkLookupDNSSEC(b *testing.B) { 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() - rec := middleware.NewResponseRecorder(&coretest.ResponseWriter{}) + rec := middleware.NewResponseRecorder(&test.ResponseWriter{}) - tc := coretest.Case{ + tc := test.Case{ Qname: "b.miek.nl.", Qtype: dns.TypeA, Do: true, Rcode: dns.RcodeNameError, Ns: []dns.RR{ - coretest.NSEC("archive.miek.nl. 14400 IN NSEC go.dns.miek.nl. CNAME RRSIG NSEC"), - coretest.RRSIG("archive.miek.nl. 14400 IN RRSIG NSEC 8 3 14400 20160426031301 20160327031301 12051 miek.nl. jEpx8lcp4do5fWXg="), - coretest.NSEC("miek.nl. 14400 IN NSEC a.miek.nl. A NS SOA MX AAAA RRSIG NSEC DNSKEY"), - coretest.RRSIG("miek.nl. 14400 IN RRSIG NSEC 8 2 14400 20160426031301 20160327031301 12051 miek.nl. mFfc3r/9PSC1H6oSpdC"), - coretest.RRSIG("miek.nl. 1800 IN RRSIG SOA 8 2 1800 20160426031301 20160327031301 12051 miek.nl. FIrzy07acBbtyQczy1dc="), - coretest.SOA("miek.nl. 1800 IN SOA linode.atoom.net. miek.miek.nl. 1282630057 14400 3600 604800 14400"), + test.NSEC("archive.miek.nl. 14400 IN NSEC go.dns.miek.nl. CNAME RRSIG NSEC"), + test.RRSIG("archive.miek.nl. 14400 IN RRSIG NSEC 8 3 14400 20160426031301 20160327031301 12051 miek.nl. jEpx8lcp4do5fWXg="), + test.NSEC("miek.nl. 14400 IN NSEC a.miek.nl. A NS SOA MX AAAA RRSIG NSEC DNSKEY"), + test.RRSIG("miek.nl. 14400 IN RRSIG NSEC 8 2 14400 20160426031301 20160327031301 12051 miek.nl. mFfc3r/9PSC1H6oSpdC"), + test.RRSIG("miek.nl. 1800 IN RRSIG SOA 8 2 1800 20160426031301 20160327031301 12051 miek.nl. FIrzy07acBbtyQczy1dc="), + test.SOA("miek.nl. 1800 IN SOA linode.atoom.net. miek.miek.nl. 1282630057 14400 3600 604800 14400"), }, } diff --git a/middleware/file/ent_test.go b/middleware/file/ent_test.go index 38455b2b5..735ec67fe 100644 --- a/middleware/file/ent_test.go +++ b/middleware/file/ent_test.go @@ -6,28 +6,28 @@ import ( "testing" "github.com/miekg/coredns/middleware" - coretest "github.com/miekg/coredns/middleware/testing" + "github.com/miekg/coredns/middleware/test" "github.com/miekg/dns" "golang.org/x/net/context" ) -var entTestCases = []coretest.Case{ +var entTestCases = []test.Case{ { Qname: "b.c.miek.nl.", Qtype: dns.TypeA, 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, Ns: []dns.RR{ - coretest.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="), - coretest.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.NSEC("a.miek.nl. 14400 IN NSEC a.b.c.miek.nl. A RRSIG NSEC"), + test.RRSIG("a.miek.nl. 14400 IN RRSIG NSEC 8 3 14400 20160502144311 20160402144311 12051 miek.nl. d5XZEy6SUpq98ZKUlzqhAfkLI9pQPc="), + test.RRSIG("miek.nl. 1800 IN RRSIG SOA 8 2 1800 20160502144311 20160402144311 12051 miek.nl. KegoBxA3Tbrhlc4cEdkRiteIkOfsq"), + 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) { 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() for _, tc := range entTestCases { m := tc.Msg() - rec := middleware.NewResponseRecorder(&coretest.ResponseWriter{}) + rec := middleware.NewResponseRecorder(&test.ResponseWriter{}) _, err := fm.ServeDNS(ctx, rec, m) if err != nil { t.Errorf("expected no error, got %v\n", err) @@ -51,23 +51,23 @@ func TestLookupENT(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, test.Answer, resp.Answer) { 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) } - if !coretest.Section(t, tc, coretest.Extra, resp.Extra) { + if !test.Section(t, tc, test.Extra, resp.Extra) { t.Logf("%v\n", resp) } } diff --git a/middleware/file/lookup_test.go b/middleware/file/lookup_test.go index 5be7494ab..53ca71001 100644 --- a/middleware/file/lookup_test.go +++ b/middleware/file/lookup_test.go @@ -6,56 +6,56 @@ import ( "testing" "github.com/miekg/coredns/middleware" - coretest "github.com/miekg/coredns/middleware/testing" + "github.com/miekg/coredns/middleware/test" "github.com/miekg/dns" "golang.org/x/net/context" ) -var dnsTestCases = []coretest.Case{ +var dnsTestCases = []test.Case{ { Qname: "www.miek.nl.", Qtype: dns.TypeA, 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{ - 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, 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, 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, Answer: []dns.RR{ - coretest.MX("miek.nl. 1800 IN MX 1 aspmx.l.google.com."), - coretest.MX("miek.nl. 1800 IN MX 10 aspmx2.googlemail.com."), - coretest.MX("miek.nl. 1800 IN MX 10 aspmx3.googlemail.com."), - coretest.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 1 aspmx.l.google.com."), + test.MX("miek.nl. 1800 IN MX 10 aspmx2.googlemail.com."), + test.MX("miek.nl. 1800 IN MX 10 aspmx3.googlemail.com."), + test.MX("miek.nl. 1800 IN MX 5 alt1.aspmx.l.google.com."), + test.MX("miek.nl. 1800 IN MX 5 alt2.aspmx.l.google.com."), }, }, { Qname: "a.miek.nl.", Qtype: dns.TypeSRV, 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, Rcode: dns.RcodeNameError, 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) { 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() for _, tc := range dnsTestCases { m := tc.Msg() - rec := middleware.NewResponseRecorder(&coretest.ResponseWriter{}) + rec := middleware.NewResponseRecorder(&test.ResponseWriter{}) _, err := fm.ServeDNS(ctx, rec, m) if err != nil { t.Errorf("expected no error, got %v\n", err) @@ -85,34 +85,34 @@ 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, test.Answer, resp.Answer) { 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) } - if !coretest.Section(t, tc, coretest.Extra, resp.Extra) { + if !test.Section(t, tc, test.Extra, resp.Extra) { t.Logf("%v\n", resp) } } } 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() m := dnsTestCases[0].Msg() - rec := middleware.NewResponseRecorder(&coretest.ResponseWriter{}) + rec := middleware.NewResponseRecorder(&test.ResponseWriter{}) fm.ServeDNS(ctx, rec, m) } @@ -122,18 +122,18 @@ func BenchmarkLookup(b *testing.B) { 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() - rec := middleware.NewResponseRecorder(&coretest.ResponseWriter{}) + rec := middleware.NewResponseRecorder(&test.ResponseWriter{}) - tc := coretest.Case{ + tc := test.Case{ Qname: "www.miek.nl.", Qtype: dns.TypeA, 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{ - coretest.A("a.miek.nl. 1800 IN A 139.162.196.78"), + test.A("a.miek.nl. 1800 IN A 139.162.196.78"), }, } diff --git a/middleware/file/secondary_test.go b/middleware/file/secondary_test.go index 111770320..e86751a8c 100644 --- a/middleware/file/secondary_test.go +++ b/middleware/file/secondary_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/miekg/coredns/middleware" - coretest "github.com/miekg/coredns/middleware/testing" + "github.com/miekg/coredns/middleware/test" "github.com/miekg/dns" ) @@ -46,14 +46,14 @@ func (s *soa) Handler(w dns.ResponseWriter, req *dns.Msg) { switch req.Question[0].Qtype { case dns.TypeSOA: 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) case dns.TypeAXFR: 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[1] = coretest.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[3] = 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] = test.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] = test.SOA(fmt.Sprintf("%s IN SOA bla. bla. %d 0 0 0 0 ", testZone, s.serial)) w.WriteMsg(m) } } @@ -62,7 +62,7 @@ func (s *soa) TransferHandler(w dns.ResponseWriter, req *dns.Msg) { m := new(dns.Msg) m.SetReply(req) 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) } @@ -74,7 +74,7 @@ func TestShouldTransfer(t *testing.T) { dns.HandleFunc(testZone, soa.Handler) 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 { t.Fatalf("unable to run test server: %v", err) } @@ -85,7 +85,7 @@ func TestShouldTransfer(t *testing.T) { z.TransferFrom = []string{addrstr} // 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() if err != nil { t.Fatalf("unable to run shouldTransfer: %v", err) @@ -94,7 +94,7 @@ func TestShouldTransfer(t *testing.T) { t.Fatalf("shouldTransfer should return true for serial: %q", soa.serial-1) } // 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() if err != nil { t.Fatalf("unable to run shouldTransfer: %v", err) @@ -110,7 +110,7 @@ func TestTransferIn(t *testing.T) { dns.HandleFunc(testZone, soa.Handler) 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 { t.Fatalf("unable to run test server: %v", err) } @@ -152,5 +152,5 @@ func NewState(zone string, qtype uint16) middleware.State { m := new(dns.Msg) m.SetQuestion("example.com.", dns.TypeA) m.SetEdns0(4097, true) - return middleware.State{W: &coretest.ResponseWriter{}, Req: m} + return middleware.State{W: &test.ResponseWriter{}, Req: m} } diff --git a/middleware/file/wildcard_test.go b/middleware/file/wildcard_test.go index 896889208..cff1292cc 100644 --- a/middleware/file/wildcard_test.go +++ b/middleware/file/wildcard_test.go @@ -6,40 +6,40 @@ import ( "testing" "github.com/miekg/coredns/middleware" - coretest "github.com/miekg/coredns/middleware/testing" + "github.com/miekg/coredns/middleware/test" "github.com/miekg/dns" "golang.org/x/net/context" ) -var wildcardTestCases = []coretest.Case{ +var wildcardTestCases = []test.Case{ { Qname: "wild.dnssex.nl.", Qtype: dns.TypeTXT, 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, Answer: []dns.RR{ - coretest.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.RRSIG("wild.dnssex.nl. 1800 IN RRSIG TXT 8 2 1800 20160428190224 20160329190224 14460 dnssex.nl. FUZSTyvZfeuuOpCm"), + 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 /* { Qname: "wild.dnssex.nl.", Qtype: dns.TypeSRV, 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, Answer: []dns.RR{ - coretest.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.RRSIG("wild.dnssex.nl. 1800 IN RRSIG TXT 8 2 1800 20160428190224 20160329190224 14460 dnssex.nl. FUZSTyvZfeuuOpCm"), + test.TXT(`wild.dnssex.nl. 1800 IN TXT "Doing It Safe Is Better"`), }, }, */ @@ -51,13 +51,13 @@ func TestLookupWildcard(t *testing.T) { 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() for _, tc := range wildcardTestCases { m := tc.Msg() - rec := middleware.NewResponseRecorder(&coretest.ResponseWriter{}) + rec := middleware.NewResponseRecorder(&test.ResponseWriter{}) _, err := fm.ServeDNS(ctx, rec, m) if err != nil { t.Errorf("expected no error, got %v\n", err) @@ -65,21 +65,21 @@ func TestLookupWildcard(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, test.Answer, resp.Answer) { 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) } - if !coretest.Section(t, tc, coretest.Extra, resp.Extra) { + if !test.Section(t, tc, test.Extra, resp.Extra) { t.Logf("%v\n", resp) } } diff --git a/middleware/loadbalance/loadbalance_test.go b/middleware/loadbalance/loadbalance_test.go index a880cc676..5f1ff2ecb 100644 --- a/middleware/loadbalance/loadbalance_test.go +++ b/middleware/loadbalance/loadbalance_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/miekg/coredns/middleware" - coretest "github.com/miekg/coredns/middleware/testing" + "github.com/miekg/coredns/middleware/test" "github.com/miekg/dns" "golang.org/x/net/context" @@ -56,7 +56,7 @@ func TestLoadBalance(t *testing.T) { }, } - rec := middleware.NewResponseRecorder(&coretest.ResponseWriter{}) + rec := middleware.NewResponseRecorder(&test.ResponseWriter{}) for i, test := range tests { req := new(dns.Msg) diff --git a/middleware/log/log_test.go b/middleware/log/log_test.go index 32c5e37d1..b5df1ad76 100644 --- a/middleware/log/log_test.go +++ b/middleware/log/log_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/miekg/coredns/middleware" - coretest "github.com/miekg/coredns/middleware/testing" + "github.com/miekg/coredns/middleware/test" "github.com/miekg/dns" "golang.org/x/net/context" @@ -37,7 +37,7 @@ func TestLoggedStatus(t *testing.T) { r := new(dns.Msg) r.SetQuestion("example.org.", dns.TypeA) - rec := middleware.NewResponseRecorder(&coretest.ResponseWriter{}) + rec := middleware.NewResponseRecorder(&test.ResponseWriter{}) rcode, _ := logger.ServeDNS(ctx, rec, r) if rcode != 0 { diff --git a/middleware/proxy/lookup_test.go b/middleware/proxy/lookup_test.go index 55c589d82..1b764af01 100644 --- a/middleware/proxy/lookup_test.go +++ b/middleware/proxy/lookup_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/miekg/coredns/middleware" - coretest "github.com/miekg/coredns/middleware/testing" + "github.com/miekg/coredns/middleware/test" "github.com/miekg/dns" ) @@ -32,5 +32,5 @@ func TestLookupProxy(t *testing.T) { } func fakeState() middleware.State { - return middleware.State{W: &coretest.ResponseWriter{}, Req: new(dns.Msg)} + return middleware.State{W: &test.ResponseWriter{}, Req: new(dns.Msg)} } diff --git a/middleware/rewrite/rewrite_test.go b/middleware/rewrite/rewrite_test.go index 6dafdf3a6..50aa64ad2 100644 --- a/middleware/rewrite/rewrite_test.go +++ b/middleware/rewrite/rewrite_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/miekg/coredns/middleware" - coretest "github.com/miekg/coredns/middleware/testing" + "github.com/miekg/coredns/middleware/test" "github.com/miekg/dns" "golang.org/x/net/context" @@ -45,23 +45,23 @@ func TestRewrite(t *testing.T) { } ctx := context.TODO() - for i, test := range tests { + for i, tc := range tests { m := new(dns.Msg) - m.SetQuestion(test.from, test.fromT) - m.Question[0].Qclass = test.fromC + m.SetQuestion(tc.from, tc.fromT) + m.Question[0].Qclass = tc.fromC - rec := middleware.NewResponseRecorder(&coretest.ResponseWriter{}) + rec := middleware.NewResponseRecorder(&test.ResponseWriter{}) rw.ServeDNS(ctx, rec, m) resp := rec.Msg() - if resp.Question[0].Name != test.to { - t.Errorf("Test %d: Expected Name to be '%s' but was '%s'", i, test.to, resp.Question[0].Name) + if resp.Question[0].Name != tc.to { + 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 { - t.Errorf("Test %d: Expected Type to be '%d' but was '%d'", i, test.toT, resp.Question[0].Qtype) + if resp.Question[0].Qtype != tc.toT { + 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 { - t.Errorf("Test %d: Expected Class to be '%d' but was '%d'", i, test.toC, resp.Question[0].Qclass) + if resp.Question[0].Qclass != tc.toC { + t.Errorf("Test %d: Expected Class to be '%d' but was '%d'", i, tc.toC, resp.Question[0].Qclass) } } diff --git a/middleware/state_test.go b/middleware/state_test.go index fe36480dd..ae4f1407a 100644 --- a/middleware/state_test.go +++ b/middleware/state_test.go @@ -3,7 +3,7 @@ package middleware import ( "testing" - coretest "github.com/miekg/coredns/middleware/testing" + "github.com/miekg/coredns/middleware/test" "github.com/miekg/dns" ) @@ -51,7 +51,7 @@ func testState() State { m := new(dns.Msg) m.SetQuestion("example.com.", dns.TypeA) m.SetEdns0(4097, true) - return State{W: &coretest.ResponseWriter{}, Req: m} + return State{W: &test.ResponseWriter{}, Req: m} } /* diff --git a/middleware/testing/helpers.go b/middleware/test/helpers.go index 49264ea1c..7caa3fd4a 100644 --- a/middleware/testing/helpers.go +++ b/middleware/test/helpers.go @@ -1,4 +1,4 @@ -package testing +package test import ( "testing" diff --git a/middleware/testing/responsewriter.go b/middleware/test/responsewriter.go index 6106cce85..fb70d7e8d 100644 --- a/middleware/testing/responsewriter.go +++ b/middleware/test/responsewriter.go @@ -1,4 +1,4 @@ -package testing +package test import ( "net" diff --git a/middleware/testing/server.go b/middleware/test/server.go index b32b8b965..71b316107 100644 --- a/middleware/testing/server.go +++ b/middleware/test/server.go @@ -1,4 +1,4 @@ -package testing +package test import ( "net" |