aboutsummaryrefslogtreecommitdiff
path: root/middleware/loadbalance/loadbalance_test.go
diff options
context:
space:
mode:
authorGravatar Miek Gieben <miek@miek.nl> 2017-01-12 08:13:50 +0000
committerGravatar GitHub <noreply@github.com> 2017-01-12 08:13:50 +0000
commit94c59da57783c04426833dfcfa085f3ea304a1db (patch)
tree921de757789e423e547ebfa1905cdd361b203c15 /middleware/loadbalance/loadbalance_test.go
parent0c3ad499d87b4ee4e43a49ac8c8102e6369d7e19 (diff)
downloadcoredns-94c59da57783c04426833dfcfa085f3ea304a1db.tar.gz
coredns-94c59da57783c04426833dfcfa085f3ea304a1db.tar.zst
coredns-94c59da57783c04426833dfcfa085f3ea304a1db.zip
Run tests in parallel (#478)
Create a small speedup running the tests: PASS ok github.com/miekg/coredns/test 10.329s PASS ok github.com/miekg/coredns/test 6.079s Skip the etcd ones. Doing the middleware/*/*_test ones doesn't yield any speedup as these are still done on a per directory basis.
Diffstat (limited to 'middleware/loadbalance/loadbalance_test.go')
-rw-r--r--middleware/loadbalance/loadbalance_test.go57
1 files changed, 26 insertions, 31 deletions
diff --git a/middleware/loadbalance/loadbalance_test.go b/middleware/loadbalance/loadbalance_test.go
index 2a5096004..983186a1c 100644
--- a/middleware/loadbalance/loadbalance_test.go
+++ b/middleware/loadbalance/loadbalance_test.go
@@ -27,14 +27,14 @@ func TestLoadBalance(t *testing.T) {
}{
{
answer: []dns.RR{
- newCNAME("cname1.region2.skydns.test. 300 IN CNAME cname2.region2.skydns.test."),
- newCNAME("cname2.region2.skydns.test. 300 IN CNAME cname3.region2.skydns.test."),
- newCNAME("cname5.region2.skydns.test. 300 IN CNAME cname6.region2.skydns.test."),
- newCNAME("cname6.region2.skydns.test. 300 IN CNAME endpoint.region2.skydns.test."),
- newA("endpoint.region2.skydns.test. 300 IN A 10.240.0.1"),
- newMX("mx.region2.skydns.test. 300 IN MX 1 mx1.region2.skydns.test."),
- newMX("mx.region2.skydns.test. 300 IN MX 2 mx2.region2.skydns.test."),
- newMX("mx.region2.skydns.test. 300 IN MX 3 mx3.region2.skydns.test."),
+ test.CNAME("cname1.region2.skydns.test. 300 IN CNAME cname2.region2.skydns.test."),
+ test.CNAME("cname2.region2.skydns.test. 300 IN CNAME cname3.region2.skydns.test."),
+ test.CNAME("cname5.region2.skydns.test. 300 IN CNAME cname6.region2.skydns.test."),
+ test.CNAME("cname6.region2.skydns.test. 300 IN CNAME endpoint.region2.skydns.test."),
+ test.A("endpoint.region2.skydns.test. 300 IN A 10.240.0.1"),
+ test.MX("mx.region2.skydns.test. 300 IN MX 1 mx1.region2.skydns.test."),
+ test.MX("mx.region2.skydns.test. 300 IN MX 2 mx2.region2.skydns.test."),
+ test.MX("mx.region2.skydns.test. 300 IN MX 3 mx3.region2.skydns.test."),
},
cnameAnswer: 4,
addressAnswer: 1,
@@ -42,9 +42,9 @@ func TestLoadBalance(t *testing.T) {
},
{
answer: []dns.RR{
- newA("endpoint.region2.skydns.test. 300 IN A 10.240.0.1"),
- newMX("mx.region2.skydns.test. 300 IN MX 1 mx1.region2.skydns.test."),
- newCNAME("cname.region2.skydns.test. 300 IN CNAME endpoint.region2.skydns.test."),
+ test.A("endpoint.region2.skydns.test. 300 IN A 10.240.0.1"),
+ test.MX("mx.region2.skydns.test. 300 IN MX 1 mx1.region2.skydns.test."),
+ test.CNAME("cname.region2.skydns.test. 300 IN CNAME endpoint.region2.skydns.test."),
},
cnameAnswer: 1,
addressAnswer: 1,
@@ -52,23 +52,23 @@ func TestLoadBalance(t *testing.T) {
},
{
answer: []dns.RR{
- newMX("mx.region2.skydns.test. 300 IN MX 1 mx1.region2.skydns.test."),
- newA("endpoint.region2.skydns.test. 300 IN A 10.240.0.1"),
- newA("endpoint.region2.skydns.test. 300 IN A 10.240.0.2"),
- newMX("mx.region2.skydns.test. 300 IN MX 1 mx2.region2.skydns.test."),
- newCNAME("cname2.region2.skydns.test. 300 IN CNAME cname3.region2.skydns.test."),
- newA("endpoint.region2.skydns.test. 300 IN A 10.240.0.3"),
- newMX("mx.region2.skydns.test. 300 IN MX 1 mx3.region2.skydns.test."),
+ test.MX("mx.region2.skydns.test. 300 IN MX 1 mx1.region2.skydns.test."),
+ test.A("endpoint.region2.skydns.test. 300 IN A 10.240.0.1"),
+ test.A("endpoint.region2.skydns.test. 300 IN A 10.240.0.2"),
+ test.MX("mx.region2.skydns.test. 300 IN MX 1 mx2.region2.skydns.test."),
+ test.CNAME("cname2.region2.skydns.test. 300 IN CNAME cname3.region2.skydns.test."),
+ test.A("endpoint.region2.skydns.test. 300 IN A 10.240.0.3"),
+ test.MX("mx.region2.skydns.test. 300 IN MX 1 mx3.region2.skydns.test."),
},
extra: []dns.RR{
- newA("endpoint.region2.skydns.test. 300 IN A 10.240.0.1"),
- newAAAA("endpoint.region2.skydns.test. 300 IN AAAA ::1"),
- newMX("mx.region2.skydns.test. 300 IN MX 1 mx1.region2.skydns.test."),
- newCNAME("cname2.region2.skydns.test. 300 IN CNAME cname3.region2.skydns.test."),
- newMX("mx.region2.skydns.test. 300 IN MX 1 mx2.region2.skydns.test."),
- newA("endpoint.region2.skydns.test. 300 IN A 10.240.0.3"),
- newAAAA("endpoint.region2.skydns.test. 300 IN AAAA ::2"),
- newMX("mx.region2.skydns.test. 300 IN MX 1 mx3.region2.skydns.test."),
+ test.A("endpoint.region2.skydns.test. 300 IN A 10.240.0.1"),
+ test.AAAA("endpoint.region2.skydns.test. 300 IN AAAA ::1"),
+ test.MX("mx.region2.skydns.test. 300 IN MX 1 mx1.region2.skydns.test."),
+ test.CNAME("cname2.region2.skydns.test. 300 IN CNAME cname3.region2.skydns.test."),
+ test.MX("mx.region2.skydns.test. 300 IN MX 1 mx2.region2.skydns.test."),
+ test.A("endpoint.region2.skydns.test. 300 IN A 10.240.0.3"),
+ test.AAAA("endpoint.region2.skydns.test. 300 IN AAAA ::2"),
+ test.MX("mx.region2.skydns.test. 300 IN MX 1 mx3.region2.skydns.test."),
},
cnameAnswer: 1,
cnameExtra: 1,
@@ -166,8 +166,3 @@ func handler() middleware.Handler {
return dns.RcodeSuccess, nil
})
}
-
-func newA(rr string) *dns.A { r, _ := dns.NewRR(rr); return r.(*dns.A) }
-func newAAAA(rr string) *dns.AAAA { r, _ := dns.NewRR(rr); return r.(*dns.AAAA) }
-func newCNAME(rr string) *dns.CNAME { r, _ := dns.NewRR(rr); return r.(*dns.CNAME) }
-func newMX(rr string) *dns.MX { r, _ := dns.NewRR(rr); return r.(*dns.MX) }