luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Fix tests 

I'm not sure how I thought this passed last night, it was obviously wrong.
This commit is contained in:
Sean Chittenden 2016-03-30 10:16:05 -07:00
parent 41fada485a
commit 12f1a71f00
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
command/agent/dns_test.go
View File

@ -2124,15 +2124,15 @@ 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 len(in.Answer) != expectedService {
return false, fmt.Errorf("%d/%d answers received for type %v for %s", len(in.Answer), answerLimit, 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 len(in.Answer) != expectedQuery {
return false, fmt.Errorf("%d/%d answers received for type %v for %s", len(in.Answer), answerLimit, 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 len(in.Answer) != expectedQueryID {
return false, fmt.Errorf("%d/%d answers received for type %v for %s", len(in.Answer), answerLimit, question) return false, fmt.Errorf("%d/%d answers received for type %v for %s", len(in.Answer), answerLimit, qType, question)
} }
default: default:
panic("abort") panic("abort")
@ -2174,17 +2174,17 @@ func TestDNS_ServiceLookup_AnswerLimits(t *testing.T) {
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)
if !ok { if !ok {
t.Errorf("Expected service A lookup %d to pass: %v", test.name, err) t.Errorf("Expected service A lookup %s to pass: %v", test.name, err)
} }
ok, err = testDNS_ServiceLookup_responseLimits(t, test.udpAnswerLimit, dns.TypeAAAA, test.expectedAAAAService, test.expectedAAAAQuery, test.expectedAAAAQueryID) ok, err = testDNS_ServiceLookup_responseLimits(t, test.udpAnswerLimit, dns.TypeAAAA, test.expectedAAAAService, test.expectedAAAAQuery, test.expectedAAAAQueryID)
if !ok { if !ok {
t.Errorf("Expected service AAAA lookup %d to pass: %v", test.name, err) t.Errorf("Expected service AAAA lookup %s to pass: %v", test.name, err)
} }
ok, err = testDNS_ServiceLookup_responseLimits(t, test.udpAnswerLimit, dns.TypeANY, test.expectedANYService, test.expectedANYQuery, test.expectedANYQueryID) ok, err = testDNS_ServiceLookup_responseLimits(t, test.udpAnswerLimit, dns.TypeANY, test.expectedANYService, test.expectedANYQuery, test.expectedANYQueryID)
if !ok { if !ok {
t.Errorf("Expected service ANY lookup %d to %v: %v", test.name, err) t.Errorf("Expected service ANY lookup %s to pass: %v", test.name, err)
} }
} }
} }