aboutsummaryrefslogtreecommitdiff
path: root/middleware/etcd/setup_test.go
diff options
context:
space:
mode:
authorGravatar Miek Gieben <miek@miek.nl> 2016-12-20 18:58:05 +0000
committerGravatar GitHub <noreply@github.com> 2016-12-20 18:58:05 +0000
commitc4ab98c6e336a1c39b3934bbb3bf691f849a6dbe (patch)
tree89d801ac1484232179bcb7c144f67b5945221367 /middleware/etcd/setup_test.go
parent451a0bd5294f6c8a6c9c725c75ac1a9cbc996a42 (diff)
downloadcoredns-c4ab98c6e336a1c39b3934bbb3bf691f849a6dbe.tar.gz
coredns-c4ab98c6e336a1c39b3934bbb3bf691f849a6dbe.tar.zst
coredns-c4ab98c6e336a1c39b3934bbb3bf691f849a6dbe.zip
Add middleware.NextOrFailure (#462)
This checks if the next middleware to be called is nil, and if so returns ServerFailure and an error. This makes the next calling more robust and saves some lines of code. Also prefix the error with the name of the middleware to aid in debugging.
Diffstat (limited to 'middleware/etcd/setup_test.go')
-rw-r--r--middleware/etcd/setup_test.go7
1 files changed, 1 insertions, 6 deletions
diff --git a/middleware/etcd/setup_test.go b/middleware/etcd/setup_test.go
index c1e33109c..e7e51f065 100644
--- a/middleware/etcd/setup_test.go
+++ b/middleware/etcd/setup_test.go
@@ -17,7 +17,6 @@ import (
etcdc "github.com/coreos/etcd/client"
"github.com/mholt/caddy"
- "github.com/miekg/dns"
"golang.org/x/net/context"
)
@@ -66,11 +65,7 @@ func TestLookup(t *testing.T) {
m := tc.Msg()
rec := dnsrecorder.New(&test.ResponseWriter{})
- _, err := etc.ServeDNS(ctxt, rec, m)
- if err != nil {
- t.Errorf("expected no error, got: %v for %s %s\n", err, m.Question[0].Name, dns.Type(m.Question[0].Qtype))
- return
- }
+ etc.ServeDNS(ctxt, rec, m)
resp := rec.Msg
sort.Sort(test.RRSet(resp.Answer))