From 725becd134752caead1aa2b2cf3a72d01c13b599 Mon Sep 17 00:00:00 2001 From: Miek Gieben Date: Sat, 19 Jan 2019 11:23:13 +0000 Subject: Stop importing testing in the main binary (#2479) * 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 * Drop import testing from metrics plugin Signed-off-by: Miek Gieben * more fiddling Signed-off-by: Miek Gieben --- plugin/dnssec/handler_test.go | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'plugin/dnssec/handler_test.go') diff --git a/plugin/dnssec/handler_test.go b/plugin/dnssec/handler_test.go index 8e997bca8..a1e24b7bb 100644 --- a/plugin/dnssec/handler_test.go +++ b/plugin/dnssec/handler_test.go @@ -112,11 +112,13 @@ func TestLookupZone(t *testing.T) { rec := dnstest.NewRecorder(&test.ResponseWriter{}) _, err := dh.ServeDNS(context.TODO(), rec, m) if err != nil { - t.Errorf("Expected no error, got %v\n", err) + t.Errorf("Expected no error, got %v", err) return } - test.SortAndCheck(t, rec.Msg, tc) + if err := test.SortAndCheck(rec.Msg, tc); err != nil { + t.Error(err) + } } } @@ -133,7 +135,7 @@ func TestLookupDNSKEY(t *testing.T) { rec := dnstest.NewRecorder(&test.ResponseWriter{}) _, err := dh.ServeDNS(context.TODO(), rec, m) if err != nil { - t.Errorf("Expected no error, got %v\n", err) + t.Errorf("Expected no error, got %v", err) return } @@ -142,7 +144,9 @@ func TestLookupDNSKEY(t *testing.T) { t.Errorf("Authoritative Answer should be true, got false") } - test.SortAndCheck(t, resp, tc) + if err := test.SortAndCheck(resp, tc); err != nil { + t.Error(err) + } // If there is an NSEC present in authority section check if the bitmap does not have the qtype set. for _, rr := range resp.Ns { -- cgit v1.2.3