More review feedback

weaveworks · Aug 20, 2015 · 6824487 · 6824487
1 parent 1897624
commit 6824487
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/nameserver/dns.go b/nameserver/dns.go
@@ -292,10 +292,8 @@ func (h *handler) truncateResponse(request, response *dns.Msg) {
 }
 
 func (h *handler) responseTooBig(request, response *dns.Msg) bool {
-	if len(response.Answer) <= 1 || h.maxResponseSize <= 0 {
-		return false
-	}
-	return response.Len() > h.getMaxResponseSize(request)
+	return h.maxResponseSize > 0 && len(response.Answer) > 1 &&
+		response.Len() > h.getMaxResponseSize(request)
 }
 
 func (h *handler) getMaxResponseSize(req *dns.Msg) int {

diff --git a/test/295_dns_large_response_test.sh b/test/295_dns_large_response_test.sh
@@ -19,8 +19,7 @@ weave_on $HOST1 dns-add $IPS $CID -h $NAME
 assert_raises "exec_on $HOST1 c0 dig MX $NAME | grep -q 'status: NXDOMAIN'"
 
 check() {
-    M=$(exec_on $HOST1 c0 dig +short $@ $NAME A | grep -v ';;' | wc -l)
-    assert_raises "test $M -eq $N"
+    assert "exec_on $HOST1 c0 dig +short $@ $NAME A | grep -v ';;' | wc -l" $N
 }
 
 check