Mirrors/coredns
1
0
Fork 0
mirror of https://github.com/coredns/coredns.git synced 2025-11-28 14:44:12 -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/file/delegation_test.go
View File

@@ -173,12 +173,14 @@ func testDelegation(t *testing.T, z, origin string, testcases []test.Case) {
rec := dnstest.NewRecorder(&test.ResponseWriter{})
_, err := fm.ServeDNS(ctx, rec, m)
if err != nil {
t.Errorf("Expected no error, got %q\n", err)
t.Errorf("Expected no error, got %q", err)
return
}
resp := rec.Msg
test.SortAndCheck(t, resp, tc)
if err := test.SortAndCheck(resp, tc); err != nil {
t.Error(err)
}
}
}

4
plugin/file/dname_test.go
View File

@@ -107,7 +107,7 @@ func TestLookupDNAME(t *testing.T) {
rec := dnstest.NewRecorder(&test.ResponseWriter{})
_, err := fm.ServeDNS(ctx, rec, m)
if err != nil {
t.Errorf("Expected no error, got %v\n", err)
t.Errorf("Expected no error, got %v", err)
return
}
@@ -156,7 +156,7 @@ func TestLookupDNAMEDNSSEC(t *testing.T) {
rec := dnstest.NewRecorder(&test.ResponseWriter{})
_, err := fm.ServeDNS(ctx, rec, m)
if err != nil {
t.Errorf("Expected no error, got %v\n", err)
t.Errorf("Expected no error, got %v", err)
return
}

6
plugin/file/dnssec_test.go
View File

@@ -131,12 +131,14 @@ func TestLookupDNSSEC(t *testing.T) {
rec := dnstest.NewRecorder(&test.ResponseWriter{})
_, err := fm.ServeDNS(ctx, rec, m)
if err != nil {
t.Errorf("Expected no error, got %v\n", err)
t.Errorf("Expected no error, got %v", err)
return
}
resp := rec.Msg
test.SortAndCheck(t, resp, tc)
if err := test.SortAndCheck(resp, tc); err != nil {
t.Error(err)
}
}
}

6
plugin/file/ds_test.go
View File

@@ -65,11 +65,13 @@ func TestLookupDS(t *testing.T) {
rec := dnstest.NewRecorder(&test.ResponseWriter{})
_, err := fm.ServeDNS(ctx, rec, m)
if err != nil {
t.Errorf("Expected no error, got %v\n", err)
t.Errorf("Expected no error, got %v", err)
return
}
resp := rec.Msg
test.SortAndCheck(t, resp, tc)
if err := test.SortAndCheck(resp, tc); err != nil {
t.Error(err)
}
}
}

6
plugin/file/ent_test.go
View File

@@ -44,12 +44,14 @@ func TestLookupEnt(t *testing.T) {
rec := dnstest.NewRecorder(&test.ResponseWriter{})
_, err := fm.ServeDNS(ctx, rec, m)
if err != nil {
t.Errorf("Expected no error, got %v\n", err)
t.Errorf("Expected no error, got %v", err)
return
}
resp := rec.Msg
test.SortAndCheck(t, resp, tc)
if err := test.SortAndCheck(resp, tc); err != nil {
t.Error(err)
}
}
}

6
plugin/file/glue_test.go
View File

@@ -46,12 +46,14 @@ func TestLookupGlue(t *testing.T) {
rec := dnstest.NewRecorder(&test.ResponseWriter{})
_, err := fm.ServeDNS(ctx, rec, m)
if err != nil {
t.Errorf("Expected no error, got %v\n", err)
t.Errorf("Expected no error, got %v", err)
return
}
resp := rec.Msg
test.SortAndCheck(t, resp, tc)
if err := test.SortAndCheck(resp, tc); err != nil {
t.Error(err)
}
}
}

6
plugin/file/lookup_test.go
View File

@@ -117,12 +117,14 @@ func TestLookup(t *testing.T) {
rec := dnstest.NewRecorder(&test.ResponseWriter{})
_, err := fm.ServeDNS(ctx, rec, m)
if err != nil {
t.Errorf("Expected no error, got %v\n", err)
t.Errorf("Expected no error, got %v", err)
return
}
resp := rec.Msg
test.SortAndCheck(t, resp, tc)
if err := test.SortAndCheck(resp, tc); err != nil {
t.Error(err)
}
}
}

2
plugin/file/tree/less_test.go
View File

@@ -65,7 +65,7 @@ Tests:
sort.Sort(set(test.in))
for i := 0; i < len(test.in); i++ {
if test.in[i] != test.out[i] {
t.Errorf("Test %d: expected %s, got %s\n", j, test.out[i], test.in[i])
t.Errorf("Test %d: expected %s, got %s", j, test.out[i], test.in[i])
n := ""
for k, in := range test.in {
if k+1 == len(test.in) {

24
plugin/file/wildcard_test.go
View File

@@ -90,12 +90,14 @@ func TestLookupWildcard(t *testing.T) {
rec := dnstest.NewRecorder(&test.ResponseWriter{})
_, err := fm.ServeDNS(ctx, rec, m)
if err != nil {
t.Errorf("Expected no error, got %v\n", err)
t.Errorf("Expected no error, got %v", err)
return
}
resp := rec.Msg
test.SortAndCheck(t, resp, tc)
if err := test.SortAndCheck(resp, tc); err != nil {
t.Error(err)
}
}
}
@@ -151,12 +153,14 @@ func TestLookupDoubleWildcard(t *testing.T) {
rec := dnstest.NewRecorder(&test.ResponseWriter{})
_, err := fm.ServeDNS(ctx, rec, m)
if err != nil {
t.Errorf("Expected no error, got %v\n", err)
t.Errorf("Expected no error, got %v", err)
return
}
resp := rec.Msg
test.SortAndCheck(t, resp, tc)
if err := test.SortAndCheck(resp, tc); err != nil {
t.Error(err)
}
}
}
@@ -206,12 +210,14 @@ func TestLookupApexWildcard(t *testing.T) {
rec := dnstest.NewRecorder(&test.ResponseWriter{})
_, err := fm.ServeDNS(ctx, rec, m)
if err != nil {
t.Errorf("Expected no error, got %v\n", err)
t.Errorf("Expected no error, got %v", err)
return
}
resp := rec.Msg
test.SortAndCheck(t, resp, tc)
if err := test.SortAndCheck(resp, tc); err != nil {
t.Error(err)
}
}
}
@@ -249,12 +255,14 @@ func TestLookupMultiWildcard(t *testing.T) {
rec := dnstest.NewRecorder(&test.ResponseWriter{})
_, err := fm.ServeDNS(ctx, rec, m)
if err != nil {
t.Errorf("Expected no error, got %v\n", err)
t.Errorf("Expected no error, got %v", err)
return
}
resp := rec.Msg
test.SortAndCheck(t, resp, tc)
if err := test.SortAndCheck(resp, tc); err != nil {
t.Error(err)
}
}
}

4
plugin/file/zone_test.go
View File

@@ -21,10 +21,10 @@ func TestNameFromRight(t *testing.T) {
for i, tc := range tests {
got, shot := z.nameFromRight(tc.in, tc.labels)
if got != tc.expected {
t.Errorf("Test %d: expected %s, got %s\n", i, tc.expected, got)
t.Errorf("Test %d: expected %s, got %s", i, tc.expected, got)
}
if shot != tc.shot {
t.Errorf("Test %d: expected shot to be %t, got %t\n", i, tc.shot, shot)
t.Errorf("Test %d: expected shot to be %t, got %t", i, tc.shot, shot)
}
}
}