diff options
author | 2016-08-19 17:14:17 -0700 | |
---|---|---|
committer | 2016-08-19 17:14:17 -0700 | |
commit | 9ac3cab1b7b1b1e78f86ce3c6a80fbee312162e6 (patch) | |
tree | 437e9755927c33af16276ad2602a6da115f948cb /test/tests.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 'test/tests.go')
-rw-r--r-- | test/tests.go | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/test/tests.go b/test/tests.go index d38bf955f..0f9d12bae 100644 --- a/test/tests.go +++ b/test/tests.go @@ -1,12 +1,7 @@ package test import ( - "testing" - "time" - - "github.com/miekg/coredns/core" "github.com/miekg/coredns/middleware" - "github.com/miekg/coredns/server" "github.com/miekg/dns" ) @@ -25,16 +20,3 @@ func Exchange(m *dns.Msg, server, net string) (*dns.Msg, error) { c.Net = net return middleware.Exchange(c, m, server) } - -// Server returns a test server and the tcp and udp listeners addresses. -func Server(t *testing.T, corefile string) (*server.Server, string, string, error) { - srv, err := core.TestServer(t, corefile) - if err != nil { - return nil, "", "", err - } - go srv.ListenAndServe() - - time.Sleep(1 * time.Second) // yeah... I regret nothing - tcp, udp := srv.LocalAddr() - return srv, tcp.String(), udp.String(), nil -} |