aboutsummaryrefslogtreecommitdiff
path: root/test/proxy_test.go
diff options
context:
space:
mode:
authorGravatar Miek Gieben <miek@miek.nl> 2017-08-24 11:35:14 +0100
committerGravatar GitHub <noreply@github.com> 2017-08-24 11:35:14 +0100
commitf901b0cefa1475c83e6b6dc859ef35675feb41e1 (patch)
tree93d6d067e1ffe7bb8cea40921d99b5088a12acb8 /test/proxy_test.go
parentea53f8c21973494d485677ca284116382ab5fa7d (diff)
downloadcoredns-f901b0cefa1475c83e6b6dc859ef35675feb41e1.tar.gz
coredns-f901b0cefa1475c83e6b6dc859ef35675feb41e1.tar.zst
coredns-f901b0cefa1475c83e6b6dc859ef35675feb41e1.zip
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
Diffstat (limited to 'test/proxy_test.go')
-rw-r--r--test/proxy_test.go14
1 files changed, 2 insertions, 12 deletions
diff --git a/test/proxy_test.go b/test/proxy_test.go
index 1e90048f6..01402ed27 100644
--- a/test/proxy_test.go
+++ b/test/proxy_test.go
@@ -25,15 +25,10 @@ func TestLookupProxy(t *testing.T) {
}
`
- 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)
@@ -69,15 +64,10 @@ func TestLookupDnsWithForcedTcp(t *testing.T) {
}
`
- i, err := CoreDNSServer(corefile)
+ i, _, tcp, err := CoreDNSServerAndPorts(corefile)
if err != nil {
t.Fatalf("Could not get CoreDNS serving instance: %s", err)
}
-
- _, tcp := CoreDNSServerPorts(i, 0)
- if tcp == "" {
- t.Fatalf("Could not get TCP listening port")
- }
defer i.Stop()
log.SetOutput(ioutil.Discard)