Mirrors/coredns
1
0
Fork 0
mirror of https://github.com/coredns/coredns.git synced 2025-10-27 08:14:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

Speed up testing (#4239)

Browse Source 
* Speed up testing

* make notification run in the background, this recudes the test_readme
time from 18s to 0.10s
* reduce time for zone reload

* TestServeDNSConcurrent remove entirely. This took a whopping 58s for
  ... ? A few minutes staring didn't reveal wth it is actually testing.
  Making values smaller revealed race conditions in the tests. Remove
  entirely.

* Move many interval values to variables so we can reset them to short
  values for the tests.

* test_large_axfr: make the zone smaller. The number used 64K has no
  rational, make it 64/10 to speed up.
* TestProxyThreeWay: use client with shorter timeout

A few random tidbits in other tests.

Total time saved: 177s (almost 3m) - which makes it worthwhile again to
run the test locally:

this branch:

~~~
ok  	github.com/coredns/coredns/test	10.437s
cd plugin; time go t ./...
5,51s user 7,51s system 11,15s elapsed 744%CPU (
~~~

master:

~~~
ok  	github.com/coredns/coredns/test	35.252s
cd plugin; time go t ./...
157,64s user 15,39s system 50,05s elapsed 345%CPU ()
~~~
tests/ -25s
plugins/ -40s

This brings the total on 20s, and another 10s can be saved by fixing
dnstapio. Moving this to 5s would be even better, but 10s is also nice.

Signed-off-by: Miek Gieben <miek@miek.nl>

* Also 0.01

Signed-off-by: Miek Gieben <miek@miek.nl>
This commit is contained in:
Miek Gieben
2020-10-30 10:27:04 +01:00
committed by GitHub
parent bc0115d71f
commit c840caf1ef
15 changed files with 85 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
test/auto_test.go
View File

@@ -21,7 +21,7 @@ func TestAuto(t *testing.T) {
corefile := `org:0 {
auto {
directory ` + tmpdir + ` db\.(.*) {1}
reload 0.1s
reload 0.01s
}
}`
@@ -46,7 +46,7 @@ func TestAuto(t *testing.T) {
t.Fatal(err)
}
time.Sleep(150 * time.Millisecond) // wait for it to be picked up
time.Sleep(10 * time.Millisecond) // wait for it to be picked up
resp, err = dns.Exchange(m, udp)
if err != nil {
@@ -59,7 +59,7 @@ func TestAuto(t *testing.T) {
// Remove db.example.org again.
os.Remove(filepath.Join(tmpdir, "db.example.org"))
time.Sleep(150 * time.Millisecond) // wait for it to be picked up
time.Sleep(10 * time.Millisecond) // wait for it to be picked up
resp, err = dns.Exchange(m, udp)
if err != nil {
t.Fatal("Expected to receive reply, but didn't")
@@ -80,7 +80,7 @@ func TestAutoNonExistentZone(t *testing.T) {
corefile := `.:0 {
auto {
directory ` + tmpdir + ` (.*) {1}
reload 1s
reload 0.01s
}
errors stdout
}`
@@ -119,7 +119,7 @@ func TestAutoAXFR(t *testing.T) {
corefile := `org:0 {
auto {
directory ` + tmpdir + ` db\.(.*) {1}
reload 0.1s
reload 0.01s
}
transfer {
to *
@@ -142,7 +142,7 @@ func TestAutoAXFR(t *testing.T) {
t.Fatal(err)
}
time.Sleep(150 * time.Millisecond) // wait for it to be picked up
time.Sleep(10 * time.Millisecond) // wait for it to be picked up
tr := new(dns.Transfer)
m := new(dns.Msg)

4
test/file_reload_test.go
View File

@@ -21,7 +21,7 @@ func TestZoneReload(t *testing.T) {
corefile := `
example.org:0 {
file ` + name + ` {
reload 0.1s
reload 0.01s
}
}
example.net:0 {
@@ -47,7 +47,7 @@ func TestZoneReload(t *testing.T) {
// Remove RR from the Apex
ioutil.WriteFile(name, []byte(exampleOrgUpdated), 0644)
time.Sleep(150 * time.Millisecond) // reload time
time.Sleep(10 * time.Millisecond) // reload time
resp, err = dns.Exchange(m, udp)
if err != nil {

4
test/file_xfr_test.go
View File

@@ -12,9 +12,9 @@ import (
)
func TestLargeAXFR(t *testing.T) {
// Build a large zone in text format. It contains 64K AAAA RRs.
// Build a zone in text format. It contains 6.4K AAAA RRs. (this number is rather random)
var sb strings.Builder
const numAAAAs = 65536
const numAAAAs = 6553
sb.WriteString("example.com. IN SOA . . 1 60 60 60 60\n")
sb.WriteString("example.com. IN NS ns.example.\n")
for i := 0; i < numAAAAs; i++ {

5
test/proxy_health_test.go
View File

@@ -2,6 +2,7 @@ package test
import (
"testing"
"time"
"github.com/miekg/dns"
)
@@ -61,9 +62,11 @@ func TestProxyThreeWay(t *testing.T) {
m := new(dns.Msg)
m.SetQuestion("example.org.", dns.TypeA)
c := new(dns.Client)
c.Timeout = 10 * time.Millisecond
for i := 0; i < 10; i++ {
r, err := dns.Exchange(m, addr)
r, _, err := c.Exchange(m, addr)
if err != nil {
continue
}

3
test/reload_test.go
View File

@@ -7,7 +7,6 @@ import (
"net/http"
"strings"
"testing"
"time"
"github.com/miekg/dns"
)
@@ -101,8 +100,6 @@ func TestReloadMetricsHealth(t *testing.T) {
}
defer c1.Stop()
time.Sleep(100 * time.Millisecond)
// Health
resp, err := http.Get("http://localhost:53184/health")
if err != nil {