Mirrors/coredns
1
0
Fork 0
mirror of https://github.com/coredns/coredns.git synced 2025-11-02 10:13:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

Stop importing testing in the main binary (#2479)

Browse Source 
* Stop importing testing in the main binary

Stop importing "testing" into the main binary:

* test/helpers.go imported it; remote that and change function signature
* update all tests that use this

Signed-off-by: Miek Gieben <miek@miek.nl>

* Drop import testing from metrics plugin

Signed-off-by: Miek Gieben <miek@miek.nl>

* more fiddling

Signed-off-by: Miek Gieben <miek@miek.nl>
This commit is contained in:
Miek Gieben
2019-01-19 11:23:13 +00:00
committed by GitHub
parent 278303ca0d
commit 725becd134
39 changed files with 218 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugin/kubernetes/external_test.go
View File

@@ -61,16 +61,16 @@ func TestExternal(t *testing.T) {
svc, rcode := k.External(state)
if x := tc.Rcode; x != rcode {
t.Errorf("Test %d, expected rcode %d, got %d\n", i, x, rcode)
t.Errorf("Test %d, expected rcode %d, got %d", i, x, rcode)
}
if len(svc) != len(tc.Msg) {
t.Errorf("Test %d, expected %d for messages, got %d\n", i, len(tc.Msg), len(svc))
t.Errorf("Test %d, expected %d for messages, got %d", i, len(tc.Msg), len(svc))
}
for j, s := range svc {
if x := tc.Msg[j].Key; x != s.Key {
t.Errorf("Test %d, expected key %s, got %s\n", i, x, s.Key)
t.Errorf("Test %d, expected key %s, got %s", i, x, s.Key)
}
return
}

4
plugin/kubernetes/handler_case_test.go
View File

@@ -66,6 +66,8 @@ func TestPreserveCase(t *testing.T) {
t.Fatalf("Test %d, got nil message and no error for %q", i, r.Question[0].Name)
}
test.SortAndCheck(t, resp, tc)
if err := test.SortAndCheck(resp, tc); err != nil {
t.Error(err)
}
}
}

8
plugin/kubernetes/handler_ignore_emptyservice_test.go
View File

@@ -49,8 +49,12 @@ func TestServeDNSEmptyService(t *testing.T) {
}
// Before sorting, make sure that CNAMES do not appear after their target records
test.CNAMEOrder(t, resp)
if err := test.CNAMEOrder(resp); err != nil {
t.Error(err)
}
test.SortAndCheck(t, resp, tc)
if err := test.SortAndCheck(resp, tc); err != nil {
t.Error(err)
}
}
}

4
plugin/kubernetes/handler_pod_disabled_test.go
View File

@@ -54,6 +54,8 @@ func TestServeDNSModeDisabled(t *testing.T) {
t.Fatalf("Test %d, got nil message and no error for %q", i, r.Question[0].Name)
}
test.SortAndCheck(t, resp, tc)
if err := test.SortAndCheck(resp, tc); err != nil {
t.Error(err)
}
}
}

4
plugin/kubernetes/handler_pod_insecure_test.go
View File

@@ -89,6 +89,8 @@ func TestServeDNSModeInsecure(t *testing.T) {
t.Fatalf("Test %d, got nil message and no error for %q", i, r.Question[0].Name)
}
test.SortAndCheck(t, resp, tc)
if err := test.SortAndCheck(resp, tc); err != nil {
t.Error(err)
}
}
}

4
plugin/kubernetes/handler_pod_verified_test.go
View File

@@ -75,6 +75,8 @@ func TestServeDNSModeVerified(t *testing.T) {
t.Fatalf("Test %d, got nil message and no error for %q", i, r.Question[0].Name)
}
test.SortAndCheck(t, resp, tc)
if err := test.SortAndCheck(resp, tc); err != nil {
t.Error(err)
}
}
}

17
plugin/kubernetes/handler_test.go
View File

@@ -371,9 +371,13 @@ func TestServeDNS(t *testing.T) {
}
// Before sorting, make sure that CNAMES do not appear after their target records
test.CNAMEOrder(t, resp)
if err := test.CNAMEOrder(resp); err != nil {
t.Error(err)
}
test.SortAndCheck(t, resp, tc)
if err := test.SortAndCheck(resp, tc); err != nil {
t.Error(err)
}
}
}
@@ -417,10 +421,13 @@ func TestNotSyncedServeDNS(t *testing.T) {
t.Fatalf("Test %d, got nil message and no error for %q", i, r.Question[0].Name)
}
// Before sorting, make sure that CNAMES do not appear after their target records
test.CNAMEOrder(t, resp)
if err := test.CNAMEOrder(resp); err != nil {
t.Error(err)
}
test.SortAndCheck(t, resp, tc)
if err := test.SortAndCheck(resp, tc); err != nil {
t.Error(err)
}
}
}

6
plugin/kubernetes/kubernetes_apex_test.go
View File

@@ -72,7 +72,7 @@ func TestServeDNSApex(t *testing.T) {
_, err := k.ServeDNS(ctx, w, r)
if err != tc.Error {
t.Errorf("Test %d, expected no error, got %v\n", i, err)
t.Errorf("Test %d, expected no error, got %v", i, err)
return
}
if tc.Error != nil {
@@ -84,6 +84,8 @@ func TestServeDNSApex(t *testing.T) {
t.Fatalf("Test %d, got nil message and no error ford", i)
}
test.SortAndCheck(t, resp, tc)
if err := test.SortAndCheck(resp, tc); err != nil {
t.Error(err)
}
}
}

4
plugin/kubernetes/reverse_test.go
View File

@@ -200,6 +200,8 @@ 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)
}
test.SortAndCheck(t, resp, tc)
if err := test.SortAndCheck(resp, tc); err != nil {
t.Error(err)
}
}
}