status-im/consul
2
0
Fork 0
mirror of https://github.com/status-im/consul.git synced 2025-02-19 17:14:37 +00:00
Code Issues Projects Releases Wiki Activity

Change tests to accept an "at least this many" answers semantic

Browse Source 
The size of answers vary based on the target platform.  Accomodate this variance.
This commit is contained in:
Sean Chittenden 2016-03-30 11:48:32 -07:00
parent 4584e70636
commit 53380f8e92
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
command/agent/dns_test.go
View File

@ -10,6 +10,7 @@ import (
"time" "time"
"github.com/hashicorp/consul/consul/structs" "github.com/hashicorp/consul/consul/structs"
"github.com/hashicorp/consul/lib"
"github.com/hashicorp/consul/testutil" "github.com/hashicorp/consul/testutil"
"github.com/miekg/dns" "github.com/miekg/dns"
) )
@ -2123,15 +2124,18 @@ func testDNS_ServiceLookup_responseLimits(t *testing.T, answerLimit int, qType u
switch idx { switch idx {
case 0: case 0:
if len(in.Answer) != expectedService { if (expectedService > 0 && len(in.Answer) != expectedService) ||
(expectedService < -1 && len(in.Answer) < lib.AbsInt(expectedService)) {
return false, fmt.Errorf("%d/%d answers received for type %v for %s", len(in.Answer), answerLimit, qType, question) return false, fmt.Errorf("%d/%d answers received for type %v for %s", len(in.Answer), answerLimit, qType, question)
} }
case 1: case 1:
if len(in.Answer) != expectedQuery { if (expectedQuery > 0 && len(in.Answer) != expectedQuery) ||
(expectedQuery < -1 && len(in.Answer) < lib.AbsInt(expectedQuery)) {
return false, fmt.Errorf("%d/%d answers received for type %v for %s", len(in.Answer), answerLimit, qType, question) return false, fmt.Errorf("%d/%d answers received for type %v for %s", len(in.Answer), answerLimit, qType, question)
} }
case 2: case 2:
if len(in.Answer) != expectedQueryID { if (expectedQueryID > 0 && len(in.Answer) != expectedQueryID) ||
(expectedQueryID < -1 && len(in.Answer) < lib.AbsInt(expectedQueryID)) {
return false, fmt.Errorf("%d/%d answers received for type %v for %s", len(in.Answer), answerLimit, qType, question) return false, fmt.Errorf("%d/%d answers received for type %v for %s", len(in.Answer), answerLimit, qType, question)
} }
default: default:
@ -2144,7 +2148,15 @@ func testDNS_ServiceLookup_responseLimits(t *testing.T, answerLimit int, qType u
func TestDNS_ServiceLookup_AnswerLimits(t *testing.T) { func TestDNS_ServiceLookup_AnswerLimits(t *testing.T) {
// Build a matrix of config parameters (udpAnswerLimit), and the // Build a matrix of config parameters (udpAnswerLimit), and the
// length of the response per query type and question. // length of the response per query type and question. Negative
// values imply the test must return at least the abs(value) number
// of records in the answer section. This is required because, for
// example, on OS-X and Linux, the number of answers returned in a
// 512B response is different even though both platforms are x86_64
// and using the same version of Go.
//
// TODO(sean@): Why is it not identical everywhere when using the
// same compiler?
tests := []struct { tests := []struct {
name string name string
udpAnswerLimit int udpAnswerLimit int
@ -2164,12 +2176,12 @@ func TestDNS_ServiceLookup_AnswerLimits(t *testing.T) {
{"3", 3, 3, 3, 3, 3, 3, 3, 3, 3, 3}, {"3", 3, 3, 3, 3, 3, 3, 3, 3, 3, 3},
{"4", 4, 4, 4, 4, 4, 4, 4, 4, 4, 4}, {"4", 4, 4, 4, 4, 4, 4, 4, 4, 4, 4},
{"5", 5, 5, 5, 5, 5, 5, 5, 5, 5, 5}, {"5", 5, 5, 5, 5, 5, 5, 5, 5, 5, 5},
{"6", 6, 6, 6, 6, 6, 6, 5, 6, 6, 6}, {"6", 6, 6, 6, 6, 6, 6, 5, 6, 6, -5},
{"7", 7, 7, 7, 6, 7, 7, 5, 7, 7, 6}, {"7", 7, 7, 7, 6, 7, 7, 5, 7, 7, -5},
{"8", 8, 8, 8, 6, 8, 8, 5, 8, 8, 6}, {"8", 8, 8, 8, 6, 8, 8, 5, 8, 8, -5},
{"9", 9, 8, 8, 6, 8, 8, 5, 8, 8, 6}, {"9", 9, 8, 8, 6, 8, 8, 5, 8, 8, -5},
{"20", 20, 8, 8, 6, 8, 8, 5, 8, 8, 6}, {"20", 20, 8, 8, 6, 8, 8, 5, 8, -5, -5},
{"30", 30, 8, 8, 6, 8, 8, 5, 8, 8, 6}, {"30", 30, 8, 8, 6, 8, 8, 5, 8, -5, -5},
} }
for _, test := range tests { for _, test := range tests {
ok, err := testDNS_ServiceLookup_responseLimits(t, test.udpAnswerLimit, dns.TypeA, test.expectedAService, test.expectedAQuery, test.expectedAQueryID) ok, err := testDNS_ServiceLookup_responseLimits(t, test.udpAnswerLimit, dns.TypeA, test.expectedAService, test.expectedAQuery, test.expectedAQueryID)