mw/kubernetes: test cleanup (#1020)

Move tests infra to look like all other middleware, and some small
cleanups.
This commit is contained in:
Miek Gieben 2017-09-02 18:49:50 +02:00 committed by GitHub
parent 9bcddc5c16
commit 9452a0a3bc
4 changed files with 60 additions and 53 deletions

View file

@ -10,17 +10,15 @@ import (
"golang.org/x/net/context"
)
var podModeInsecureCases = map[string](test.Case){
"A Record Pod mode = Case 1": {
var podModeInsecureCases = []test.Case{
{
Qname: "10-240-0-1.podns.pod.cluster.local.", Qtype: dns.TypeA,
Rcode: dns.RcodeSuccess,
Answer: []dns.RR{
test.A("10-240-0-1.podns.pod.cluster.local. 0 IN A 10.240.0.1"),
},
},
"A Record Pod mode = Case 2": {
{
Qname: "172-0-0-2.podns.pod.cluster.local.", Qtype: dns.TypeA,
Rcode: dns.RcodeSuccess,
Answer: []dns.RR{
@ -37,14 +35,14 @@ func TestServeDNSModeInsecure(t *testing.T) {
ctx := context.TODO()
k.podMode = podModeInsecure
for testname, tc := range podModeInsecureCases {
for i, tc := range podModeInsecureCases {
r := tc.Msg()
w := dnsrecorder.New(&test.ResponseWriter{})
_, err := k.ServeDNS(ctx, w, r)
if err != tc.Error {
t.Errorf("%v expected no error, got %v\n", testname, err)
t.Errorf("Test %d expected no error, got %v", i, err)
return
}
if tc.Error != nil {
@ -53,7 +51,7 @@ func TestServeDNSModeInsecure(t *testing.T) {
resp := w.Msg
if resp == nil {
t.Fatalf("got nil message and no error for %q: %s %d", testname, r.Question[0].Name, r.Question[0].Qtype)
t.Fatalf("Test %d, got nil message and no error for %q", i, r.Question[0].Name)
}
test.SortAndCheck(t, resp, tc)