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

More Tests cases compression/no compression

This commit is contained in:
Pierre Souchay 2018-04-21 17:18:39 +02:00
parent a3b028d1d7
commit cf3cd546c8
1 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
agent/dns_test.go
View File

@ -2989,35 +2989,37 @@ func TestBinarySearch(t *testing.T) {
msgSrc.Compress = true msgSrc.Compress = true
msgSrc.SetQuestion("redis.service.consul.", dns.TypeSRV) msgSrc.SetQuestion("redis.service.consul.", dns.TypeSRV)
for i := 0; i < 50; i++ { for i := 0; i < 5000; i++ {
target := fmt.Sprintf("host-redis-%d-%d.test.acme.com.node.dc1.consul.", i/256, i%256) target := fmt.Sprintf("host-redis-%d-%d.test.acme.com.node.dc1.consul.", i/256, i%256)
msgSrc.Answer = append(msgSrc.Answer, &dns.SRV{Hdr: dns.RR_Header{Name: "redis.service.consul.", Class: 1, Rrtype: dns.TypeSRV, Ttl: 0x3c}, Port: 0x4c57, Target: target}) msgSrc.Answer = append(msgSrc.Answer, &dns.SRV{Hdr: dns.RR_Header{Name: "redis.service.consul.", Class: 1, Rrtype: dns.TypeSRV, Ttl: 0x3c}, Port: 0x4c57, Target: target})
msgSrc.Extra = append(msgSrc.Extra, &dns.CNAME{Hdr: dns.RR_Header{Name: target, Class: 1, Rrtype: dns.TypeCNAME, Ttl: 0x3c}, Target: fmt.Sprintf("fx.168.%d.%d.", i/256, i%256)}) msgSrc.Extra = append(msgSrc.Extra, &dns.CNAME{Hdr: dns.RR_Header{Name: target, Class: 1, Rrtype: dns.TypeCNAME, Ttl: 0x3c}, Target: fmt.Sprintf("fx.168.%d.%d.", i/256, i%256)})
} }
for idx, maxSize := range []int{12, 256, 512, 8192, 65535} { for _, compress := range []bool{true, false} {
t.Run(fmt.Sprintf("binarySearch %d", maxSize), func(t *testing.T) { for idx, maxSize := range []int{12, 256, 512, 8192, 65535} {
msg := new(dns.Msg) t.Run(fmt.Sprintf("binarySearch %d", maxSize), func(t *testing.T) {
msgSrc.Compress = true msg := new(dns.Msg)
msgSrc.SetQuestion("redis.service.consul.", dns.TypeSRV) msgSrc.Compress = compress
msg.Answer = msgSrc.Answer msgSrc.SetQuestion("redis.service.consul.", dns.TypeSRV)
msg.Extra = msgSrc.Extra msg.Answer = msgSrc.Answer
index := make(map[string]dns.RR, len(msg.Extra)) msg.Extra = msgSrc.Extra
indexRRs(msg.Extra, index) index := make(map[string]dns.RR, len(msg.Extra))
blen := dnsBinaryTruncate(msg, maxSize, index, true) indexRRs(msg.Extra, index)
msg.Answer = msg.Answer[:blen] blen := dnsBinaryTruncate(msg, maxSize, index, true)
syncExtra(index, msg) msg.Answer = msg.Answer[:blen]
predicted := msg.Len() syncExtra(index, msg)
buf, err := msg.Pack() predicted := msg.Len()
if err != nil { buf, err := msg.Pack()
t.Error(err) if err != nil {
} t.Error(err)
if predicted < len(buf) { }
t.Fatalf("Bug in DNS library: %d != %d", predicted, len(buf)) if predicted < len(buf) {
} t.Fatalf("Bug in DNS library: %d != %d", predicted, len(buf))
if len(buf) > maxSize || (idx != 0 && len(buf) < 16) || (maxSize == 65535 && blen != 50) { }
t.Fatalf("bad[%d]: %d > %d", idx, len(buf), maxSize) if len(buf) > maxSize || (idx != 0 && len(buf) < 16) {
} t.Fatalf("bad[%d]: %d > %d", idx, len(buf), maxSize)
}) }
})
}
} }
} }
@ -3095,9 +3097,8 @@ func TestDNS_TCP_and_UDP_Truncate(t *testing.T) {
if err != nil && err != dns.ErrTruncated { if err != nil && err != dns.ErrTruncated {
t.Fatalf("err: %v", err) t.Fatalf("err: %v", err)
} }
// Check for the truncate bit // Check for the truncate bit
shouldBeTruncated := numServices > 4095 shouldBeTruncated := numServices > 5000
if shouldBeTruncated != in.Truncated || len(in.Answer) > 2000 || len(in.Answer) < 1 || in.Len() > 65535 { if shouldBeTruncated != in.Truncated || len(in.Answer) > 2000 || len(in.Answer) < 1 || in.Len() > 65535 {
info := fmt.Sprintf("service %s question:=%s (%s) (%d total records) sz:= %d in %v", info := fmt.Sprintf("service %s question:=%s (%s) (%d total records) sz:= %d in %v",