diff options
| author |  Yong Tang <yong.tang.github@outlook.com>
| 2017-09-01 10:21:05 -0700 |
|---|---|---|
| committer |  Miek Gieben <miek@miek.nl>
| 2017-09-01 19:21:05 +0200 |
| commit | 4b14243e9bb9fb6147771e7a5b76c934a28acdd7 (patch) | |
| tree | 16c990ef82a84876d30e3e35270f5c2bc715b718 /middleware | |
| parent | 6493858893960c677f1af118ff53626366d40a22 (diff) | |
| download | coredns-4b14243e9bb9fb6147771e7a5b76c934a28acdd7.tar.gz coredns-4b14243e9bb9fb6147771e7a5b76c934a28acdd7.tar.zst coredns-4b14243e9bb9fb6147771e7a5b76c934a28acdd7.zip | |
Add k8s tags to related tests (#1018)
, so that `make test` will pass by default.
Also fixed several ineffassign and golint issues.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Diffstat (limited to 'middleware')
| -rw-r--r-- | middleware/dnstap/msg/msg.go | 3 | ||||
| -rw-r--r-- | middleware/dnstap/out/tcp_test.go | 12 | ||||
| -rw-r--r-- | middleware/kubernetes/federation.go | 3 |
3 files changed, 10 insertions, 8 deletions
diff --git a/middleware/dnstap/msg/msg.go b/middleware/dnstap/msg/msg.go index 1d42ea3ba..0e2cd5d40 100644 --- a/middleware/dnstap/msg/msg.go +++ b/middleware/dnstap/msg/msg.go @@ -65,9 +65,8 @@ func (d *Data) HostPort(addr string) error { d.SocketFam = tap.SocketFamily_INET6 } return nil - } else { - return errors.New("not an ip address") } + return errors.New("not an ip address") } // RemoteAddr parses the information about the remote address into Data. diff --git a/middleware/dnstap/out/tcp_test.go b/middleware/dnstap/out/tcp_test.go index d76cd9280..113603cd4 100644 --- a/middleware/dnstap/out/tcp_test.go +++ b/middleware/dnstap/out/tcp_test.go @@ -5,7 +5,7 @@ import ( "testing" ) -func sendOneTcp(tcp *TCP) error { +func sendOneTCP(tcp *TCP) error { if _, err := tcp.Write([]byte("frame")); err != nil { return err } @@ -14,10 +14,10 @@ func sendOneTcp(tcp *TCP) error { } return nil } -func TestTcp(t *testing.T) { +func TestTCP(t *testing.T) { tcp := NewTCP("localhost:14000") - if err := sendOneTcp(tcp); err == nil { + if err := sendOneTCP(tcp); err == nil { t.Fatal("Not listening but no error.") return } @@ -34,7 +34,7 @@ func TestTcp(t *testing.T) { wait <- true }() - if err := sendOneTcp(tcp); err != nil { + if err := sendOneTCP(tcp); err != nil { t.Fatalf("send one: %s", err) return } @@ -44,7 +44,7 @@ func TestTcp(t *testing.T) { // TODO: When the server isn't responding according to the framestream protocol // the thread is blocked. /* - if err := sendOneTcp(tcp); err == nil { + if err := sendOneTCP(tcp); err == nil { panic("must fail") } */ @@ -54,7 +54,7 @@ func TestTcp(t *testing.T) { wait <- true }() - if err := sendOneTcp(tcp); err != nil { + if err := sendOneTCP(tcp); err != nil { t.Fatalf("send one: %s", err) return } diff --git a/middleware/kubernetes/federation.go b/middleware/kubernetes/federation.go index 96ce22730..f192a4a76 100644 --- a/middleware/kubernetes/federation.go +++ b/middleware/kubernetes/federation.go @@ -30,6 +30,9 @@ func (k *Kubernetes) Federations(state request.Request, fname, fzone string) (ms return msg.Service{}, err } r, err := parseRequest(state) + if err != nil { + return msg.Service{}, err + } lz := node.Labels[LabelZone] lr := node.Labels[LabelRegion] |