From 7219bce2852ab45bf112b910076db4b8cd1baffc Mon Sep 17 00:00:00 2001 From: Miek Gieben Date: Sun, 25 Aug 2019 12:59:44 +0000 Subject: testing: TCPServer was only used in secondary_test.go (#3186) TCPServer was only used in secondary_test.go and even there it wasn't needed. Remove the file. Signed-off-by: Miek Gieben --- plugin/file/secondary_test.go | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) (limited to 'plugin/file/secondary_test.go') diff --git a/plugin/file/secondary_test.go b/plugin/file/secondary_test.go index 5c393e440..820c9b9d0 100644 --- a/plugin/file/secondary_test.go +++ b/plugin/file/secondary_test.go @@ -4,6 +4,7 @@ import ( "fmt" "testing" + "github.com/coredns/coredns/plugin/pkg/dnstest" "github.com/coredns/coredns/plugin/test" "github.com/coredns/coredns/request" @@ -71,18 +72,12 @@ const testZone = "secondary.miek.nl." func TestShouldTransfer(t *testing.T) { soa := soa{250} - dns.HandleFunc(testZone, soa.Handler) - defer dns.HandleRemove(testZone) - - 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() + s := dnstest.NewServer(soa.Handler) + defer s.Close() z := NewZone("testzone", "test") z.origin = testZone - z.TransferFrom = []string{addrstr} + z.TransferFrom = []string{s.Addr} // when we have a nil SOA (initial state) should, err := z.shouldTransfer() @@ -115,21 +110,14 @@ func TestShouldTransfer(t *testing.T) { func TestTransferIn(t *testing.T) { soa := soa{250} - dns.HandleFunc(testZone, soa.Handler) - defer dns.HandleRemove(testZone) - - 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() + s := dnstest.NewServer(soa.Handler) + defer s.Close() z := new(Zone) z.origin = testZone - z.TransferFrom = []string{addrstr} + z.TransferFrom = []string{s.Addr} - err = z.TransferIn() - if err != nil { + if err := z.TransferIn(); err != nil { 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) { -- cgit v1.2.3