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/metrics/metrics_test.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'plugin/metrics/metrics_test.go') diff --git a/plugin/metrics/metrics_test.go b/plugin/metrics/metrics_test.go index 211abdb23..b0e311b73 100644 --- a/plugin/metrics/metrics_test.go +++ b/plugin/metrics/metrics_test.go @@ -5,7 +5,6 @@ import ( "testing" "github.com/coredns/coredns/plugin" - mtest "github.com/coredns/coredns/plugin/metrics/test" "github.com/coredns/coredns/plugin/pkg/dnstest" "github.com/coredns/coredns/plugin/test" @@ -71,10 +70,10 @@ func TestMetrics(t *testing.T) { t.Fatalf("Test %d: Expected no error, but got %s", i, err) } - result := mtest.Scrape(t, "http://"+ListenAddr+"/metrics") + result := test.Scrape("http://" + ListenAddr + "/metrics") if tc.expectedValue != "" { - got, _ := mtest.MetricValue(tc.metric, result) + got, _ := test.MetricValue(tc.metric, result) if got != tc.expectedValue { t.Errorf("Test %d: Expected value %s for metrics %s, but got %s", i, tc.expectedValue, tc.metric, got) } -- cgit v1.2.3