From f901b0cefa1475c83e6b6dc859ef35675feb41e1 Mon Sep 17 00:00:00 2001 From: Miek Gieben Date: Thu, 24 Aug 2017 11:35:14 +0100 Subject: tests: CoreDNSServerAndPorts (#972) * tests: CoreDNSServerAndPorts Copy from kubernetes.go and renamed to fit the style, adapted almost all callers. This is a mechanicl change, no testdata was changed. * typos --- test/proxy_http_health_test.go | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'test/proxy_http_health_test.go') diff --git a/test/proxy_http_health_test.go b/test/proxy_http_health_test.go index b190f2b45..a331083de 100644 --- a/test/proxy_http_health_test.go +++ b/test/proxy_http_health_test.go @@ -51,15 +51,10 @@ func TestProxyWithHTTPCheckOK(t *testing.T) { } ` - authoritativeInstance, err := CoreDNSServer(authoritativeCorefile) + authoritativeInstance, authoritativeAddr, _, err := CoreDNSServerAndPorts(authoritativeCorefile) if err != nil { t.Fatalf("Could not get CoreDNS authoritative instance: %s", err) } - - authoritativeAddr, _ := CoreDNSServerPorts(authoritativeInstance, 0) - if authoritativeAddr == "" { - t.Fatalf("Could not get CoreDNS authoritative instance UDP listening port") - } defer authoritativeInstance.Stop() proxyCorefile := `example.org:0 { @@ -70,15 +65,10 @@ func TestProxyWithHTTPCheckOK(t *testing.T) { } ` - proxyInstance, err := CoreDNSServer(proxyCorefile) + proxyInstance, proxyAddr, _, err := CoreDNSServerAndPorts(proxyCorefile) if err != nil { t.Fatalf("Could not get CoreDNS proxy instance: %s", err) } - - proxyAddr, _ := CoreDNSServerPorts(proxyInstance, 0) - if proxyAddr == "" { - t.Fatalf("Could not get CoreDNS proxy instance UDP listening port") - } defer proxyInstance.Stop() p := proxy.NewLookup([]string{proxyAddr}) -- cgit v1.2.3