Mirrors/coredns
1
0
Fork 0
mirror of https://github.com/coredns/coredns.git synced 2025-11-08 21:16:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

tests: clean up output

Browse Source 
Some document improvements and add a few more tests.
This commit is contained in:
Miek Gieben
2016-10-08 16:44:43 +01:00
parent e43384b501
commit e8b4412564
8 changed files with 53 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
middleware/test/server.go
View File

@@ -3,14 +3,13 @@ package test
import (
"net"
"sync"
"testing"
"time"
"github.com/miekg/dns"
)
// TCPServer starts a DNS server with a TCP listener on laddr.
func TCPServer(t *testing.T, laddr string) (*dns.Server, string, error) {
func TCPServer(laddr string) (*dns.Server, string, error) {
l, err := net.Listen("tcp", laddr)
if err != nil {
return nil, "", err
@@ -20,7 +19,7 @@ func TCPServer(t *testing.T, laddr string) (*dns.Server, string, error) {
waitLock := sync.Mutex{}
waitLock.Lock()
server.NotifyStartedFunc = func() { t.Logf("started TCP server on %s", l.Addr()); waitLock.Unlock() }
server.NotifyStartedFunc = func() { waitLock.Unlock() }
go func() {
server.ActivateAndServe()
@@ -32,7 +31,7 @@ func TCPServer(t *testing.T, laddr string) (*dns.Server, string, error) {
}
// UDPServer starts a DNS server with an UDP listener on laddr.
func UDPServer(t *testing.T, laddr string) (*dns.Server, string, error) {
func UDPServer(laddr string) (*dns.Server, string, error) {
pc, err := net.ListenPacket("udp", laddr)
if err != nil {
return nil, "", err
@@ -41,7 +40,7 @@ func UDPServer(t *testing.T, laddr string) (*dns.Server, string, error) {
waitLock := sync.Mutex{}
waitLock.Lock()
server.NotifyStartedFunc = func() { t.Logf("started UDP server on %s", pc.LocalAddr()); waitLock.Unlock() }
server.NotifyStartedFunc = func() { waitLock.Unlock() }
go func() {
server.ActivateAndServe()