diff options
| author |  Miek Gieben <miek@miek.nl>
| 2016-08-19 17:14:17 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2016-08-19 17:14:17 -0700 |
| commit | 9ac3cab1b7b1b1e78f86ce3c6a80fbee312162e6 (patch) | |
| tree | 437e9755927c33af16276ad2602a6da115f948cb /middleware/etcd/multi_test.go | |
| parent | a1989c35231b0e5ea271b2f68d82c1a63e697cd0 (diff) | |
| download | coredns-9ac3cab1b7b1b1e78f86ce3c6a80fbee312162e6.tar.gz coredns-9ac3cab1b7b1b1e78f86ce3c6a80fbee312162e6.tar.zst coredns-9ac3cab1b7b1b1e78f86ce3c6a80fbee312162e6.zip | |
Make CoreDNS a server type plugin for Caddy (#220)
* Make CoreDNS a server type plugin for Caddy
Remove code we don't need and port all middleware over. Fix all tests
and rework the documentation.
Also make `go generate` build a caddy binary which we then copy into
our directory. This means `go build`-builds remain working as-is.
And new etc instances in each etcd test for better isolation.
Fix more tests and rework test.Server with the newer support Caddy offers.
Fix Makefile to support new mode of operation.
Diffstat (limited to 'middleware/etcd/multi_test.go')
| -rw-r--r-- | middleware/etcd/multi_test.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/middleware/etcd/multi_test.go b/middleware/etcd/multi_test.go index 19e6ca7a3..f4b59f50b 100644 --- a/middleware/etcd/multi_test.go +++ b/middleware/etcd/multi_test.go @@ -14,10 +14,9 @@ import ( ) func TestMultiLookup(t *testing.T) { + etc := newEtcdMiddleware() etc.Zones = []string{"skydns.test.", "miek.nl."} - defer func() { etc.Zones = []string{"skydns.test.", "skydns_extra.test.", "in-addr.arpa."} }() etc.Next = test.ErrorHandler() - defer func() { etc.Next = nil }() for _, serv := range servicesMulti { set(t, etc, serv.Key, 0, serv) |