aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/auto_test.go4
-rw-r--r--test/cache_test.go4
-rw-r--r--test/ds_file_test.go4
-rw-r--r--test/etcd_cache_test.go6
-rw-r--r--test/etcd_test.go12
-rw-r--r--test/external_test.go6
-rw-r--r--test/file_cname_proxy_test.go4
-rw-r--r--test/file_reload_test.go4
-rw-r--r--test/file_srv_additional_test.go4
-rw-r--r--test/kubernetes_api_fallthrough_test.go2
-rw-r--r--test/kubernetes_fallthrough_test.go2
-rw-r--r--test/kubernetes_nsexposed_test.go2
-rw-r--r--test/kubernetes_pods_test.go2
-rw-r--r--test/kubernetes_test.go2
-rw-r--r--test/metrics_test.go8
-rw-r--r--test/middleware_dnssec_test.go2
-rw-r--r--test/middleware_test.go2
-rw-r--r--test/proxy_health_test.go4
-rw-r--r--test/proxy_http_health_test.go4
-rw-r--r--test/proxy_test.go4
-rw-r--r--test/readme_test.go4
-rw-r--r--test/reverse_test.go4
-rw-r--r--test/secondary_test.go4
-rw-r--r--test/wildcard_test.go4
24 files changed, 49 insertions, 49 deletions
diff --git a/test/auto_test.go b/test/auto_test.go
index b5a9c2b09..ff130188b 100644
--- a/test/auto_test.go
+++ b/test/auto_test.go
@@ -8,8 +8,8 @@ import (
"testing"
"time"
- "github.com/coredns/coredns/middleware/proxy"
- "github.com/coredns/coredns/middleware/test"
+ "github.com/coredns/coredns/plugin/proxy"
+ "github.com/coredns/coredns/plugin/test"
"github.com/coredns/coredns/request"
"github.com/miekg/dns"
diff --git a/test/cache_test.go b/test/cache_test.go
index bb5017a24..2379cd2a3 100644
--- a/test/cache_test.go
+++ b/test/cache_test.go
@@ -6,8 +6,8 @@ import (
"testing"
"time"
- "github.com/coredns/coredns/middleware/proxy"
- "github.com/coredns/coredns/middleware/test"
+ "github.com/coredns/coredns/plugin/proxy"
+ "github.com/coredns/coredns/plugin/test"
"github.com/coredns/coredns/request"
"github.com/miekg/dns"
diff --git a/test/ds_file_test.go b/test/ds_file_test.go
index 2ec19c5b4..8d342dab1 100644
--- a/test/ds_file_test.go
+++ b/test/ds_file_test.go
@@ -5,8 +5,8 @@ import (
"log"
"testing"
- "github.com/coredns/coredns/middleware/proxy"
- mtest "github.com/coredns/coredns/middleware/test"
+ "github.com/coredns/coredns/plugin/proxy"
+ mtest "github.com/coredns/coredns/plugin/test"
"github.com/coredns/coredns/request"
"github.com/miekg/dns"
diff --git a/test/etcd_cache_test.go b/test/etcd_cache_test.go
index db283e73e..a927a08f8 100644
--- a/test/etcd_cache_test.go
+++ b/test/etcd_cache_test.go
@@ -7,9 +7,9 @@ import (
"log"
"testing"
- "github.com/coredns/coredns/middleware/etcd/msg"
- "github.com/coredns/coredns/middleware/proxy"
- "github.com/coredns/coredns/middleware/test"
+ "github.com/coredns/coredns/plugin/etcd/msg"
+ "github.com/coredns/coredns/plugin/proxy"
+ "github.com/coredns/coredns/plugin/test"
"github.com/coredns/coredns/request"
"github.com/miekg/dns"
diff --git a/test/etcd_test.go b/test/etcd_test.go
index eaab7a730..66502e8dc 100644
--- a/test/etcd_test.go
+++ b/test/etcd_test.go
@@ -9,10 +9,10 @@ import (
"testing"
"time"
- "github.com/coredns/coredns/middleware/etcd"
- "github.com/coredns/coredns/middleware/etcd/msg"
- "github.com/coredns/coredns/middleware/proxy"
- "github.com/coredns/coredns/middleware/test"
+ "github.com/coredns/coredns/plugin/etcd"
+ "github.com/coredns/coredns/plugin/etcd/msg"
+ "github.com/coredns/coredns/plugin/proxy"
+ "github.com/coredns/coredns/plugin/test"
"github.com/coredns/coredns/request"
etcdc "github.com/coreos/etcd/client"
@@ -87,7 +87,7 @@ var servicesStub = []*msg.Service{
{Host: "199.43.132.53", Key: "a.example.net.stub.dns.skydns.test."},
}
-// Copied from middleware/etcd/setup_test.go
+// Copied from plugin/etcd/setup_test.go
func set(ctx context.Context, t *testing.T, e *etcd.Etcd, k string, ttl time.Duration, m *msg.Service) {
b, err := json.Marshal(m)
if err != nil {
@@ -97,7 +97,7 @@ func set(ctx context.Context, t *testing.T, e *etcd.Etcd, k string, ttl time.Dur
e.Client.Set(ctx, path, string(b), &etcdc.SetOptions{TTL: ttl})
}
-// Copied from middleware/etcd/setup_test.go
+// Copied from plugin/etcd/setup_test.go
func delete(ctx context.Context, t *testing.T, e *etcd.Etcd, k string) {
path, _ := msg.PathWithWildcard(k, e.PathPrefix)
e.Client.Delete(ctx, path, &etcdc.DeleteOptions{Recursive: false})
diff --git a/test/external_test.go b/test/external_test.go
index 9109f1f29..6b014552c 100644
--- a/test/external_test.go
+++ b/test/external_test.go
@@ -8,7 +8,7 @@ import (
"testing"
)
-// Go get external example middleware, compile it into CoreDNS
+// Go get external example plugin, compile it into CoreDNS
// and check if it is really there, but running coredns -plugins.
// Dangerous test as it messes with your git tree, maybe use tag?
@@ -36,7 +36,7 @@ func testExternalMiddlewareCompile(t *testing.T) {
}
if !strings.Contains(string(out), "dns.example") {
- t.Fatal("dns.example middleware should be there")
+ t.Fatal("dns.example plugin should be there")
}
}
@@ -51,7 +51,7 @@ func run(t *testing.T, c *exec.Cmd) ([]byte, error) {
}
func addExampleMiddleware() error {
- f, err := os.OpenFile("../middleware.cfg", os.O_APPEND|os.O_WRONLY, os.ModeAppend)
+ f, err := os.OpenFile("../plugin.cfg", os.O_APPEND|os.O_WRONLY, os.ModeAppend)
if err != nil {
return err
}
diff --git a/test/file_cname_proxy_test.go b/test/file_cname_proxy_test.go
index 6630abb42..b0adcf203 100644
--- a/test/file_cname_proxy_test.go
+++ b/test/file_cname_proxy_test.go
@@ -5,8 +5,8 @@ import (
"log"
"testing"
- "github.com/coredns/coredns/middleware/proxy"
- "github.com/coredns/coredns/middleware/test"
+ "github.com/coredns/coredns/plugin/proxy"
+ "github.com/coredns/coredns/plugin/test"
"github.com/coredns/coredns/request"
"github.com/miekg/dns"
diff --git a/test/file_reload_test.go b/test/file_reload_test.go
index e7ecc4d09..e944faa55 100644
--- a/test/file_reload_test.go
+++ b/test/file_reload_test.go
@@ -6,8 +6,8 @@ import (
"testing"
"time"
- "github.com/coredns/coredns/middleware/proxy"
- "github.com/coredns/coredns/middleware/test"
+ "github.com/coredns/coredns/plugin/proxy"
+ "github.com/coredns/coredns/plugin/test"
"github.com/coredns/coredns/request"
"github.com/miekg/dns"
diff --git a/test/file_srv_additional_test.go b/test/file_srv_additional_test.go
index 1925f98c1..26ae1f9aa 100644
--- a/test/file_srv_additional_test.go
+++ b/test/file_srv_additional_test.go
@@ -5,8 +5,8 @@ import (
"log"
"testing"
- "github.com/coredns/coredns/middleware/proxy"
- "github.com/coredns/coredns/middleware/test"
+ "github.com/coredns/coredns/plugin/proxy"
+ "github.com/coredns/coredns/plugin/test"
"github.com/coredns/coredns/request"
"github.com/miekg/dns"
diff --git a/test/kubernetes_api_fallthrough_test.go b/test/kubernetes_api_fallthrough_test.go
index 20c0aaa21..08d380f67 100644
--- a/test/kubernetes_api_fallthrough_test.go
+++ b/test/kubernetes_api_fallthrough_test.go
@@ -6,7 +6,7 @@ import (
"testing"
"time"
- "github.com/coredns/coredns/middleware/test"
+ "github.com/coredns/coredns/plugin/test"
"github.com/miekg/dns"
)
diff --git a/test/kubernetes_fallthrough_test.go b/test/kubernetes_fallthrough_test.go
index 4e5ee5d5c..1b0545056 100644
--- a/test/kubernetes_fallthrough_test.go
+++ b/test/kubernetes_fallthrough_test.go
@@ -8,7 +8,7 @@ import (
"os"
"testing"
- "github.com/coredns/coredns/middleware/test"
+ "github.com/coredns/coredns/plugin/test"
"github.com/miekg/dns"
)
diff --git a/test/kubernetes_nsexposed_test.go b/test/kubernetes_nsexposed_test.go
index 1c3e470e5..f5161c9a1 100644
--- a/test/kubernetes_nsexposed_test.go
+++ b/test/kubernetes_nsexposed_test.go
@@ -6,7 +6,7 @@ import (
"testing"
"time"
- "github.com/coredns/coredns/middleware/test"
+ "github.com/coredns/coredns/plugin/test"
"github.com/miekg/dns"
)
diff --git a/test/kubernetes_pods_test.go b/test/kubernetes_pods_test.go
index a06d0aaac..67447f979 100644
--- a/test/kubernetes_pods_test.go
+++ b/test/kubernetes_pods_test.go
@@ -6,7 +6,7 @@ import (
"testing"
"time"
- "github.com/coredns/coredns/middleware/test"
+ "github.com/coredns/coredns/plugin/test"
"github.com/miekg/dns"
)
diff --git a/test/kubernetes_test.go b/test/kubernetes_test.go
index 0a5d286f2..c3004a951 100644
--- a/test/kubernetes_test.go
+++ b/test/kubernetes_test.go
@@ -13,7 +13,7 @@ import (
"testing"
"time"
- "github.com/coredns/coredns/middleware/test"
+ "github.com/coredns/coredns/plugin/test"
"github.com/mholt/caddy"
"github.com/miekg/dns"
diff --git a/test/metrics_test.go b/test/metrics_test.go
index fa7adee80..4a1665c5b 100644
--- a/test/metrics_test.go
+++ b/test/metrics_test.go
@@ -8,10 +8,10 @@ import (
"testing"
"time"
- "github.com/coredns/coredns/middleware/cache"
- "github.com/coredns/coredns/middleware/metrics"
- mtest "github.com/coredns/coredns/middleware/metrics/test"
- "github.com/coredns/coredns/middleware/metrics/vars"
+ "github.com/coredns/coredns/plugin/cache"
+ "github.com/coredns/coredns/plugin/metrics"
+ mtest "github.com/coredns/coredns/plugin/metrics/test"
+ "github.com/coredns/coredns/plugin/metrics/vars"
"github.com/miekg/dns"
)
diff --git a/test/middleware_dnssec_test.go b/test/middleware_dnssec_test.go
index d1dbfc594..0ae6507a3 100644
--- a/test/middleware_dnssec_test.go
+++ b/test/middleware_dnssec_test.go
@@ -6,7 +6,7 @@ import (
"os"
"testing"
- "github.com/coredns/coredns/middleware/test"
+ "github.com/coredns/coredns/plugin/test"
"github.com/miekg/dns"
)
diff --git a/test/middleware_test.go b/test/middleware_test.go
index 745d47d7b..9f3604e4e 100644
--- a/test/middleware_test.go
+++ b/test/middleware_test.go
@@ -5,7 +5,7 @@ import (
"log"
"testing"
- "github.com/coredns/coredns/middleware/test"
+ "github.com/coredns/coredns/plugin/test"
"github.com/miekg/dns"
)
diff --git a/test/proxy_health_test.go b/test/proxy_health_test.go
index 34c2c24c5..8d7c229b8 100644
--- a/test/proxy_health_test.go
+++ b/test/proxy_health_test.go
@@ -5,8 +5,8 @@ import (
"log"
"testing"
- "github.com/coredns/coredns/middleware/proxy"
- "github.com/coredns/coredns/middleware/test"
+ "github.com/coredns/coredns/plugin/proxy"
+ "github.com/coredns/coredns/plugin/test"
"github.com/coredns/coredns/request"
"github.com/miekg/dns"
diff --git a/test/proxy_http_health_test.go b/test/proxy_http_health_test.go
index a331083de..2a31093fe 100644
--- a/test/proxy_http_health_test.go
+++ b/test/proxy_http_health_test.go
@@ -10,8 +10,8 @@ import (
"net/url"
"testing"
- "github.com/coredns/coredns/middleware/proxy"
- "github.com/coredns/coredns/middleware/test"
+ "github.com/coredns/coredns/plugin/proxy"
+ "github.com/coredns/coredns/plugin/test"
"github.com/coredns/coredns/request"
"github.com/miekg/dns"
)
diff --git a/test/proxy_test.go b/test/proxy_test.go
index 01402ed27..90c1e3940 100644
--- a/test/proxy_test.go
+++ b/test/proxy_test.go
@@ -5,8 +5,8 @@ import (
"log"
"testing"
- "github.com/coredns/coredns/middleware/proxy"
- "github.com/coredns/coredns/middleware/test"
+ "github.com/coredns/coredns/plugin/proxy"
+ "github.com/coredns/coredns/plugin/test"
"github.com/coredns/coredns/request"
"github.com/miekg/dns"
diff --git a/test/readme_test.go b/test/readme_test.go
index 9c9eae249..26f44234e 100644
--- a/test/readme_test.go
+++ b/test/readme_test.go
@@ -14,7 +14,7 @@ import (
"github.com/mholt/caddy"
)
-// Pasrse all README.md's of the middleware and check if every example Corefile
+// Pasrse all README.md's of the plugin and check if every example Corefile
// actually works. Each corefile is only used if:
//
// ~~~ corefile
@@ -30,7 +30,7 @@ func TestReadme(t *testing.T) {
log.SetOutput(ioutil.Discard)
- middle := filepath.Join("..", "middleware")
+ middle := filepath.Join("..", "plugin")
dirs, err := ioutil.ReadDir(middle)
if err != nil {
t.Fatalf("Could not read %s: %q", middle, err)
diff --git a/test/reverse_test.go b/test/reverse_test.go
index 25b3d9068..184a5fe1f 100644
--- a/test/reverse_test.go
+++ b/test/reverse_test.go
@@ -5,8 +5,8 @@ import (
"log"
"testing"
- "github.com/coredns/coredns/middleware/proxy"
- "github.com/coredns/coredns/middleware/test"
+ "github.com/coredns/coredns/plugin/proxy"
+ "github.com/coredns/coredns/plugin/test"
"github.com/coredns/coredns/request"
"github.com/miekg/dns"
diff --git a/test/secondary_test.go b/test/secondary_test.go
index b3eed5c1b..370d523c9 100644
--- a/test/secondary_test.go
+++ b/test/secondary_test.go
@@ -5,8 +5,8 @@ import (
"log"
"testing"
- "github.com/coredns/coredns/middleware/proxy"
- "github.com/coredns/coredns/middleware/test"
+ "github.com/coredns/coredns/plugin/proxy"
+ "github.com/coredns/coredns/plugin/test"
"github.com/coredns/coredns/request"
"github.com/miekg/dns"
diff --git a/test/wildcard_test.go b/test/wildcard_test.go
index 67feb2e77..b233e3031 100644
--- a/test/wildcard_test.go
+++ b/test/wildcard_test.go
@@ -5,8 +5,8 @@ import (
"log"
"testing"
- "github.com/coredns/coredns/middleware/proxy"
- "github.com/coredns/coredns/middleware/test"
+ "github.com/coredns/coredns/plugin/proxy"
+ "github.com/coredns/coredns/plugin/test"
"github.com/coredns/coredns/request"
"github.com/miekg/dns"