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/cache_test.go | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'test/cache_test.go') diff --git a/test/cache_test.go b/test/cache_test.go index 43ef29efb..bb5017a24 100644 --- a/test/cache_test.go +++ b/test/cache_test.go @@ -26,15 +26,10 @@ func TestLookupCache(t *testing.T) { file ` + name + ` } ` - i, err := CoreDNSServer(corefile) + i, udp, _, err := CoreDNSServerAndPorts(corefile) if err != nil { t.Fatalf("Could not get CoreDNS serving instance: %s", err) } - - udp, _ := CoreDNSServerPorts(i, 0) - if udp == "" { - t.Fatalf("Could not get UDP listening port") - } defer i.Stop() // Start caching proxy CoreDNS that we want to test. @@ -43,15 +38,10 @@ func TestLookupCache(t *testing.T) { cache } ` - i, err = CoreDNSServer(corefile) + i, udp, _, err = CoreDNSServerAndPorts(corefile) if err != nil { t.Fatalf("Could not get CoreDNS serving instance: %s", err) } - - udp, _ = CoreDNSServerPorts(i, 0) - if udp == "" { - t.Fatalf("Could not get UDP listening port") - } defer i.Stop() log.SetOutput(ioutil.Discard) -- cgit v1.2.3