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

tests: add SortAndCheck helper (#926)

Browse Source 
There was quite some code duplication in a lot of tests to check if
an answer was considered Ok. Created a test.SortAndCheck helper function
that takes care of this.
This commit is contained in:
Miek Gieben
2017-08-16 15:30:58 +01:00
committed by GitHub
parent 65b56248f0
commit 7f46df6d27
24 changed files with 58 additions and 520 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
middleware/kubernetes/handler_test.go
View File

@@ -1,7 +1,6 @@
package kubernetes
import (
"sort"
"testing"
"github.com/coredns/coredns/middleware/pkg/dnsrecorder"
@@ -201,24 +200,7 @@ func runServeDNSTests(ctx context.Context, t *testing.T, dnsTestCases map[string
}
}
sort.Sort(test.RRSet(resp.Answer))
sort.Sort(test.RRSet(resp.Ns))
sort.Sort(test.RRSet(resp.Extra))
if !test.Header(t, tc, resp) {
t.Logf("%v Received:\n %v\n", testname, resp)
continue
}
if !test.Section(t, tc, test.Answer, resp.Answer) {
t.Logf("%v Received:\n %v\n", testname, resp)
}
if !test.Section(t, tc, test.Ns, resp.Ns) {
t.Logf("%v Received:\n %v\n", testname, resp)
}
if !test.Section(t, tc, test.Extra, resp.Extra) {
t.Logf("%v Received:\n %v\n", testname, resp)
}
test.SortAndCheck(t, resp, tc)
}
}

20
middleware/kubernetes/reverse_test.go
View File

@@ -1,7 +1,6 @@
package kubernetes
import (
"sort"
"testing"
"github.com/coredns/coredns/middleware/pkg/dnsrecorder"
@@ -118,23 +117,6 @@ func TestReverse(t *testing.T) {
if resp == nil {
t.Fatalf("Test %d: got nil message and no error for: %s %d", i, r.Question[0].Name, r.Question[0].Qtype)
}
sort.Sort(test.RRSet(resp.Answer))
sort.Sort(test.RRSet(resp.Ns))
sort.Sort(test.RRSet(resp.Extra))
if !test.Header(t, tc, resp) {
t.Logf("Test %d, received: %v", i, resp)
continue
}
if !test.Section(t, tc, test.Answer, resp.Answer) {
t.Logf("Test %d, received: %v", i, resp)
}
if !test.Section(t, tc, test.Ns, resp.Ns) {
t.Logf("Test %d, received: %v", i, resp)
}
if !test.Section(t, tc, test.Extra, resp.Extra) {
t.Logf("Test %d, received: %v", i, resp)
}
test.SortAndCheck(t, resp, tc)
}
}