aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--middleware/loadbalance/loadbalance_test.go57
-rw-r--r--test/auto_test.go3
-rw-r--r--test/cache_test.go1
-rw-r--r--test/ds_file_test.go1
-rw-r--r--test/etcd_test.go2
-rw-r--r--test/file_reload_test.go1
-rw-r--r--test/file_test.go1
-rw-r--r--test/kubernetes_test.go1
-rw-r--r--test/metrics_test.go2
-rw-r--r--test/middleware_dnssec_test.go1
-rw-r--r--test/proxy_test.go1
-rw-r--r--test/server.go5
-rw-r--r--test/server_test.go1
-rw-r--r--test/wildcard_test.go1
14 files changed, 46 insertions, 32 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) }
diff --git a/test/auto_test.go b/test/auto_test.go
index c44a2a8c3..7b615765a 100644
--- a/test/auto_test.go
+++ b/test/auto_test.go
@@ -16,6 +16,7 @@ import (
)
func TestAuto(t *testing.T) {
+ t.Parallel()
tmpdir, err := ioutil.TempDir(os.TempDir(), "coredns")
if err != nil {
t.Fatal(err)
@@ -81,6 +82,7 @@ func TestAuto(t *testing.T) {
}
func TestAutoNonExistentZone(t *testing.T) {
+ t.Parallel()
tmpdir, err := ioutil.TempDir(os.TempDir(), "coredns")
if err != nil {
t.Fatal(err)
@@ -119,6 +121,7 @@ func TestAutoNonExistentZone(t *testing.T) {
}
func TestAutoAXFR(t *testing.T) {
+ t.Parallel()
log.SetOutput(ioutil.Discard)
tmpdir, err := ioutil.TempDir(os.TempDir(), "coredns")
diff --git a/test/cache_test.go b/test/cache_test.go
index 5156e4d13..f1cdbe76f 100644
--- a/test/cache_test.go
+++ b/test/cache_test.go
@@ -14,6 +14,7 @@ import (
)
func TestLookupCache(t *testing.T) {
+ t.Parallel()
// Start auth. CoreDNS holding the auth zone.
name, rm, err := test.TempFile(".", exampleOrg)
if err != nil {
diff --git a/test/ds_file_test.go b/test/ds_file_test.go
index 407e04b42..b1fd7b2df 100644
--- a/test/ds_file_test.go
+++ b/test/ds_file_test.go
@@ -32,6 +32,7 @@ var dsTestCases = []mtest.Case{
}
func TestLookupDS(t *testing.T) {
+ t.Parallel()
name, rm, err := TempFile(".", miekNL)
if err != nil {
t.Fatalf("failed to created zone: %s", err)
diff --git a/test/etcd_test.go b/test/etcd_test.go
index a21fa6296..f627e3872 100644
--- a/test/etcd_test.go
+++ b/test/etcd_test.go
@@ -31,7 +31,7 @@ func etcdMiddleware() *etcd.Etcd {
// This test starts two coredns servers (and needs etcd). Configure a stubzones in both (that will loop) and
// will then test if we detect this loop.
-func TestEtcdStubForwarding(t *testing.T) {
+func TestEtcdStubLoop(t *testing.T) {
// TODO(miek)
}
diff --git a/test/file_reload_test.go b/test/file_reload_test.go
index de782cbf8..0e0bcadfc 100644
--- a/test/file_reload_test.go
+++ b/test/file_reload_test.go
@@ -13,6 +13,7 @@ import (
)
func TestZoneReload(t *testing.T) {
+ t.Parallel()
log.SetOutput(ioutil.Discard)
name, rm, err := TempFile(".", exampleOrg)
diff --git a/test/file_test.go b/test/file_test.go
index ed86a8260..d4167e38e 100644
--- a/test/file_test.go
+++ b/test/file_test.go
@@ -3,6 +3,7 @@ package test
import "testing"
func TestTempFile(t *testing.T) {
+ t.Parallel()
_, f, e := TempFile(".", "test")
if e != nil {
t.Fatalf("failed to create temp file: %s", e)
diff --git a/test/kubernetes_test.go b/test/kubernetes_test.go
index 02f731475..49d3834d8 100644
--- a/test/kubernetes_test.go
+++ b/test/kubernetes_test.go
@@ -242,6 +242,7 @@ func createTestServer(t *testing.T, corefile string) (*caddy.Instance, string) {
}
func TestKubernetesIntegration(t *testing.T) {
+ t.Parallel()
corefile :=
`.:0 {
kubernetes cluster.local 0.0.10.in-addr.arpa {
diff --git a/test/metrics_test.go b/test/metrics_test.go
index cced6b237..f51e2fb1c 100644
--- a/test/metrics_test.go
+++ b/test/metrics_test.go
@@ -16,6 +16,8 @@ import (
"github.com/miekg/dns"
)
+// fail when done in parallel
+
// Start test server that has metrics enabled. Then tear it down again.
func TestMetricsServer(t *testing.T) {
corefile := `example.org:0 {
diff --git a/test/middleware_dnssec_test.go b/test/middleware_dnssec_test.go
index 692e39141..52c54f801 100644
--- a/test/middleware_dnssec_test.go
+++ b/test/middleware_dnssec_test.go
@@ -12,6 +12,7 @@ import (
)
func TestLookupBalanceRewriteCacheDnssec(t *testing.T) {
+ t.Parallel()
name, rm, err := test.TempFile(".", exampleOrg)
if err != nil {
t.Fatalf("failed to created zone: %s", err)
diff --git a/test/proxy_test.go b/test/proxy_test.go
index b8765ef10..01bfa0500 100644
--- a/test/proxy_test.go
+++ b/test/proxy_test.go
@@ -13,6 +13,7 @@ import (
)
func TestLookupProxy(t *testing.T) {
+ t.Parallel()
name, rm, err := test.TempFile(".", exampleOrg)
if err != nil {
t.Fatalf("failed to created zone: %s", err)
diff --git a/test/server.go b/test/server.go
index d472cc7d0..b290d5a22 100644
--- a/test/server.go
+++ b/test/server.go
@@ -3,6 +3,7 @@ package test
import (
"io/ioutil"
"log"
+ "sync"
"github.com/miekg/coredns/core/dnsserver"
@@ -12,8 +13,12 @@ import (
"github.com/mholt/caddy"
)
+var mu sync.Mutex
+
// CoreDNSServer returns a CoreDNS test server. It just takes a normal Corefile as input.
func CoreDNSServer(corefile string) (*caddy.Instance, error) {
+ mu.Lock()
+ defer mu.Unlock()
caddy.Quiet = true
dnsserver.Quiet = true
log.SetOutput(ioutil.Discard)
diff --git a/test/server_test.go b/test/server_test.go
index 58e929e96..b7abc86c3 100644
--- a/test/server_test.go
+++ b/test/server_test.go
@@ -8,6 +8,7 @@ import (
// Start 2 tests server, server A will proxy to B, server B is an CH server.
func TestProxyToChaosServer(t *testing.T) {
+ t.Parallel()
corefile := `.:0 {
chaos CoreDNS-001 miek@miek.nl
}
diff --git a/test/wildcard_test.go b/test/wildcard_test.go
index 57cfdc75a..d6910e013 100644
--- a/test/wildcard_test.go
+++ b/test/wildcard_test.go
@@ -13,6 +13,7 @@ import (
)
func TestLookupWildcard(t *testing.T) {
+ t.Parallel()
name, rm, err := test.TempFile(".", exampleOrg)
if err != nil {
t.Fatalf("failed to created zone: %s", err)
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-03 06:54:45 +0000
td>simplify status code regexGravatar Fred K. Schott 2-87/+4 2022-02-03Adding StackUp Digital to the list of sponsors (#2521)Gravatar Astroalex 3-0/+10 2022-02-03[ci] collect statsGravatar FredKSchott 1-0/+1 2022-02-03[ci] yarn formatGravatar FredKSchott 2-3/+85 2022-02-02Handles all http error code file names the same as 404 files. (#2525)Gravatar Zade Viggers 2-4/+7 2022-02-02fix(sitemap): remove debug if sitemap disabled (#2514)Gravatar Mark Pinero 1-2/+2 2022-02-02[ci] update lockfile (#2515)Gravatar Fred K. Schott 1-276/+279 2022-02-02[ci] yarn formatGravatar matthewp 1-8/+8 2022-02-02[ci] release (next) (#2523)astro@0.23.0-next.1Gravatar github-actions[bot] 28-34/+41 2022-02-02[ci] yarn formatGravatar matthewp 2-17/+29 2022-02-02Fix support for scss in static build (#2522)Gravatar Matthew Phillips 6-20/+114 2022-02-02[ci] collect statsGravatar FredKSchott 1-0/+1 2022-02-01[ci] yarn formatGravatar matthewp 2-12/+12 2022-02-01[ci] release (next) (#2492)astro@0.23.0-next.0@astrojs/test-static-build-pkg@0.0.2@astrojs/markdown-remark@0.6.1-next.0Gravatar github-actions[bot] 31-43/+93 2022-02-01[ci] collect statsGravatar FredKSchott 1-0/+1 2022-01-31update congratsbot format againGravatar Fred K. Schott 1-1/+1 2022-01-31update congratsbot againGravatar Fred K. Schott 1-1/+1 2022-01-31Remove SVG animation on GitHub/NPM (#2512)Gravatar Nate Moore 1-21/+0 2022-01-31[ci] yarn formatGravatar natemoo-re 2-4/+6 2022-01-31Add Shiki as an alternative to Prism (#2497)Gravatar Juan Martín Seery 26-9/+356 2022-01-31Deprecate unescaped HTML inside of expressions (#2489)Gravatar Nate Moore 9-31/+74