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/autopath/autopath_test.go | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'plugin/autopath/autopath_test.go') diff --git a/plugin/autopath/autopath_test.go b/plugin/autopath/autopath_test.go index 4857e5c8a..5c4e554c4 100644 --- a/plugin/autopath/autopath_test.go +++ b/plugin/autopath/autopath_test.go @@ -52,7 +52,7 @@ func TestAutoPath(t *testing.T) { rec := dnstest.NewRecorder(&test.ResponseWriter{}) _, err := ap.ServeDNS(ctx, rec, m) if err != nil { - t.Errorf("Expected no error, got %v\n", err) + t.Errorf("Expected no error, got %v", err) continue } @@ -60,18 +60,18 @@ func TestAutoPath(t *testing.T) { // test of the answer. resp := rec.Msg - if !test.Header(t, tc, resp) { - t.Logf("%v\n", resp) + if err := test.Header(tc, resp); err != nil { + t.Error(err) continue } - if !test.Section(t, tc, test.Answer, resp.Answer) { - t.Logf("%v\n", resp) + if err := test.Section(tc, test.Answer, resp.Answer); err != nil { + t.Error(err) } - if !test.Section(t, tc, test.Ns, resp.Ns) { - t.Logf("%v\n", resp) + if err := test.Section(tc, test.Ns, resp.Ns); err != nil { + t.Error(err) } - if !test.Section(t, tc, test.Extra, resp.Extra) { - t.Logf("%v\n", resp) + if err := test.Section(tc, test.Extra, resp.Extra); err != nil { + t.Error(err) } } } @@ -97,7 +97,7 @@ func TestAutoPathNoAnswer(t *testing.T) { rec := dnstest.NewRecorder(&test.ResponseWriter{}) rcode, err := ap.ServeDNS(ctx, rec, m) if err != nil { - t.Errorf("Expected no error, got %v\n", err) + t.Errorf("Expected no error, got %v", err) continue } if plugin.ClientWrite(rcode) { -- cgit v1.2.3