aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorGravatar Miek Gieben <miek@miek.nl> 2020-10-15 13:19:39 +0200
committerGravatar GitHub <noreply@github.com> 2020-10-15 04:19:39 -0700
commit6938dac21d9a79bc34f4347a52fda4d1bf24b259 (patch)
tree14ff42768b6461be9347d396cdd0c3dac768be44 /test
parent269c0c5dabe2839c29e42b30faa7142ca3e0296e (diff)
downloadcoredns-6938dac21d9a79bc34f4347a52fda4d1bf24b259.tar.gz
coredns-6938dac21d9a79bc34f4347a52fda4d1bf24b259.tar.zst
coredns-6938dac21d9a79bc34f4347a52fda4d1bf24b259.zip
reduce sleeps (#4205)
This reduces the amount of sleep time to speed up testing. master: PASS ok github.com/coredns/coredns/test 42.088s 12,33s user 1,30s system 44,29s elapsed 30%CPU () this branch: PASS ok github.com/coredns/coredns/test 33.527s Signed-off-by: Miek Gieben <miek@miek.nl>
Diffstat (limited to 'test')
-rw-r--r--test/auto_test.go10
-rw-r--r--test/file_reload_test.go4
-rw-r--r--test/metrics_test.go7
-rw-r--r--test/reload_test.go2
4 files changed, 11 insertions, 12 deletions
diff --git a/test/auto_test.go b/test/auto_test.go
index 3dd0fdf79..03b290ef8 100644
--- a/test/auto_test.go
+++ b/test/auto_test.go
@@ -21,7 +21,7 @@ func TestAuto(t *testing.T) {
corefile := `org:0 {
auto {
directory ` + tmpdir + ` db\.(.*) {1}
- reload 1s
+ reload 0.1s
}
}`
@@ -46,7 +46,7 @@ func TestAuto(t *testing.T) {
t.Fatal(err)
}
- time.Sleep(1500 * time.Millisecond) // wait for it to be picked up
+ time.Sleep(150 * 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(1100 * time.Millisecond) // wait for it to be picked up
+ time.Sleep(150 * 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")
@@ -119,7 +119,7 @@ func TestAutoAXFR(t *testing.T) {
corefile := `org:0 {
auto {
directory ` + tmpdir + ` db\.(.*) {1}
- reload 1s
+ reload 0.1s
}
transfer {
to *
@@ -142,7 +142,7 @@ func TestAutoAXFR(t *testing.T) {
t.Fatal(err)
}
- time.Sleep(1100 * time.Millisecond) // wait for it to be picked up
+ time.Sleep(150 * time.Millisecond) // wait for it to be picked up
tr := new(dns.Transfer)
m := new(dns.Msg)
diff --git a/test/file_reload_test.go b/test/file_reload_test.go
index 9a131f3d6..163a8be3f 100644
--- a/test/file_reload_test.go
+++ b/test/file_reload_test.go
@@ -21,7 +21,7 @@ func TestZoneReload(t *testing.T) {
corefile := `
example.org:0 {
file ` + name + ` {
- reload 1s
+ reload 0.1s
}
}
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(2 * time.Second) // reload time
+ time.Sleep(150 * time.Millisecond) // reload time
resp, err = dns.Exchange(m, udp)
if err != nil {
diff --git a/test/metrics_test.go b/test/metrics_test.go
index 6641d615c..38092f009 100644
--- a/test/metrics_test.go
+++ b/test/metrics_test.go
@@ -78,7 +78,7 @@ func TestMetricsAuto(t *testing.T) {
corefile := `org:0 {
auto {
directory ` + tmpdir + ` db\.(.*) {1}
- reload 1s
+ reload 0.1s
}
prometheus localhost:0
}`
@@ -98,8 +98,7 @@ func TestMetricsAuto(t *testing.T) {
if err = ioutil.WriteFile(filepath.Join(tmpdir, "db.example.org"), []byte(zoneContent), 0644); err != nil {
t.Fatal(err)
}
- // TODO(miek): make the auto sleep even less.
- time.Sleep(1100 * time.Millisecond) // wait for it to be picked up
+ time.Sleep(110 * time.Millisecond) // wait for it to be picked up
m := new(dns.Msg)
m.SetQuestion("www.example.org.", dns.TypeA)
@@ -120,7 +119,7 @@ func TestMetricsAuto(t *testing.T) {
// Remove db.example.org again. And see if the metric stops increasing.
os.Remove(filepath.Join(tmpdir, "db.example.org"))
- time.Sleep(1100 * time.Millisecond) // wait for it to be picked up
+ time.Sleep(110 * time.Millisecond) // wait for it to be picked up
if _, err := dns.Exchange(m, udp); err != nil {
t.Fatalf("Could not send message: %s", err)
}
diff --git a/test/reload_test.go b/test/reload_test.go
index 697511e2e..45f961298 100644
--- a/test/reload_test.go
+++ b/test/reload_test.go
@@ -101,7 +101,7 @@ func TestReloadMetricsHealth(t *testing.T) {
}
defer c1.Stop()
- time.Sleep(1 * time.Second)
+ time.Sleep(100 * time.Millisecond)
// Health
resp, err := http.Get("http://localhost:53184/health")