aboutsummaryrefslogtreecommitdiff
path: root/test/server_test.go
diff options
context:
space:
mode:
authorGravatar Miek Gieben <miek@miek.nl> 2016-09-07 11:10:16 +0100
committerGravatar GitHub <noreply@github.com> 2016-09-07 11:10:16 +0100
commitd1f17fa7e061d91aa0af7e1fb959a68db899c812 (patch)
tree0f828a0e7bd8ca86051a721dae48e8c19a0a2f0e /test/server_test.go
parent684330fd28f65a7a8d1ad01fb4c6c5db78240f29 (diff)
downloadcoredns-d1f17fa7e061d91aa0af7e1fb959a68db899c812.tar.gz
coredns-d1f17fa7e061d91aa0af7e1fb959a68db899c812.tar.zst
coredns-d1f17fa7e061d91aa0af7e1fb959a68db899c812.zip
Cleanup: put middleware helper functions in pkgs (#245)
Move all (almost all) Go files in middleware into their own packages. This makes for better naming and discoverability. Lot of changes elsewhere to make this change. The middleware.State was renamed to request.Request which is better, but still does not cover all use-cases. It was also moved out middleware because it is used by `dnsserver` as well. A pkg/dnsutil packages was added for shared, handy, dns util functions. All normalize functions are now put in normalize.go
Diffstat (limited to 'test/server_test.go')
-rw-r--r--test/server_test.go13
1 files changed, 6 insertions, 7 deletions
diff --git a/test/server_test.go b/test/server_test.go
index a03285bf3..903922a04 100644
--- a/test/server_test.go
+++ b/test/server_test.go
@@ -17,7 +17,7 @@ func TestProxyToChaosServer(t *testing.T) {
t.Fatalf("could not get CoreDNS serving instance: %s", err)
}
- udpChaos, tcpChaos := CoreDNSServerPorts(chaos, 0)
+ udpChaos, _ := CoreDNSServerPorts(chaos, 0)
defer chaos.Stop()
corefileProxy := `.:0 {
@@ -32,24 +32,23 @@ func TestProxyToChaosServer(t *testing.T) {
udp, _ := CoreDNSServerPorts(proxy, 0)
defer proxy.Stop()
- chaosTest(t, udpChaos, "udp")
- chaosTest(t, tcpChaos, "tcp")
+ chaosTest(t, udpChaos)
- chaosTest(t, udp, "udp")
+ chaosTest(t, udp)
// chaosTest(t, tcp, "tcp"), commented out because we use the original transport to reach the
// proxy and we only forward to the udp port.
}
-func chaosTest(t *testing.T, server, net string) {
+func chaosTest(t *testing.T, server string) {
m := Msg("version.bind.", dns.TypeTXT, nil)
m.Question[0].Qclass = dns.ClassCHAOS
- r, err := Exchange(m, server, net)
+ r, err := dns.Exchange(m, server)
if err != nil {
t.Fatalf("Could not send message: %s", err)
}
if r.Rcode != dns.RcodeSuccess || len(r.Answer) == 0 {
- t.Fatalf("Expected successful reply on %s, got %s", net, dns.RcodeToString[r.Rcode])
+ t.Fatalf("Expected successful reply, got %s", dns.RcodeToString[r.Rcode])
}
if r.Answer[0].String() != `version.bind. 0 CH TXT "CoreDNS-001"` {
t.Fatalf("Expected version.bind. reply, got %s", r.Answer[0].String())