TrueCloudLab/coredns
16
0
Fork 2
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

testing: TCPServer was only used in secondary_test.go (#3186)

Browse source 
TCPServer was only used in secondary_test.go and even there it wasn't
needed. Remove the file.

Signed-off-by: Miek Gieben <miek@miek.nl>
This commit is contained in:
Miek Gieben 2019-08-25 12:59:44 +00:00 • committed by GitHub
parent 07748d0c34
commit 7219bce285
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
plugin/file/secondary_test.go
View file

@ -4,6 +4,7 @@ import (
"fmt" "fmt"
"testing" "testing"
"github.com/coredns/coredns/plugin/pkg/dnstest"
"github.com/coredns/coredns/plugin/test" "github.com/coredns/coredns/plugin/test"
"github.com/coredns/coredns/request" "github.com/coredns/coredns/request"
@ -71,18 +72,12 @@ const testZone = "secondary.miek.nl."
func TestShouldTransfer(t *testing.T) { func TestShouldTransfer(t *testing.T) {
soa := soa{250} soa := soa{250}
dns.HandleFunc(testZone, soa.Handler) s := dnstest.NewServer(soa.Handler)
defer dns.HandleRemove(testZone) defer s.Close()
s, addrstr, err := test.TCPServer("127.0.0.1:0")
if err != nil {
t.Fatalf("Unable to run test server: %v", err)
}
defer s.Shutdown()
z := NewZone("testzone", "test") z := NewZone("testzone", "test")
z.origin = testZone z.origin = testZone
z.TransferFrom = []string{addrstr} z.TransferFrom = []string{s.Addr}
// when we have a nil SOA (initial state) // when we have a nil SOA (initial state)
should, err := z.shouldTransfer() should, err := z.shouldTransfer()
@ -115,21 +110,14 @@ func TestShouldTransfer(t *testing.T) {
func TestTransferIn(t *testing.T) { func TestTransferIn(t *testing.T) {
soa := soa{250} soa := soa{250}
dns.HandleFunc(testZone, soa.Handler) s := dnstest.NewServer(soa.Handler)
defer dns.HandleRemove(testZone) defer s.Close()
s, addrstr, err := test.TCPServer("127.0.0.1:0")
if err != nil {
t.Fatalf("Unable to run test server: %v", err)
}
defer s.Shutdown()
z := new(Zone) z := new(Zone)
z.origin = testZone z.origin = testZone
z.TransferFrom = []string{addrstr} z.TransferFrom = []string{s.Addr}
err = z.TransferIn() if err := z.TransferIn(); err != nil {
if err != nil {
t.Fatalf("Unable to run TransferIn: %v", err) t.Fatalf("Unable to run TransferIn: %v", err)
} }
if z.Apex.SOA.String() != fmt.Sprintf("%s 3600 IN SOA bla. bla. 250 0 0 0 0", testZone) { if z.Apex.SOA.String() != fmt.Sprintf("%s 3600 IN SOA bla. bla. 250 0 0 0 0", testZone) {

52
plugin/test/server.go
View file

@ -1,52 +0,0 @@
package test
import (
"net"
"sync"
"time"
"github.com/miekg/dns"
)
// TCPServer starts a DNS server with a TCP listener on laddr.
func TCPServer(laddr string) (*dns.Server, string, error) {
l, err := net.Listen("tcp", laddr)
if err != nil {
return nil, "", err
}
server := &dns.Server{Listener: l, ReadTimeout: time.Hour, WriteTimeout: time.Hour}
waitLock := sync.Mutex{}
waitLock.Lock()
server.NotifyStartedFunc = func() { waitLock.Unlock() }
go func() {
server.ActivateAndServe()
l.Close()
}()
waitLock.Lock()
return server, l.Addr().String(), nil
}
// UDPServer starts a DNS server with an UDP listener on laddr.
func UDPServer(laddr string) (*dns.Server, string, error) {
pc, err := net.ListenPacket("udp", laddr)
if err != nil {
return nil, "", err
}
server := &dns.Server{PacketConn: pc, ReadTimeout: time.Hour, WriteTimeout: time.Hour}
waitLock := sync.Mutex{}
waitLock.Lock()
server.NotifyStartedFunc = func() { waitLock.Unlock() }
go func() {
server.ActivateAndServe()
pc.Close()
}()
waitLock.Lock()
return server, pc.LocalAddr().String(), nil
}