simon/acme-dns
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Fixed race conditions in tests

Browse Source
This commit is contained in:
Joona Hoikkala 2016-11-26 14:01:30 +02:00
parent 9ebc0d02ae
commit 3ae7dee8ea
No known key found for this signature in database
GPG Key ID: C14AAE0F5ADCB854
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api_test.go
View File

@ -5,7 +5,6 @@ import (
"github.com/gavv/httpexpect" "github.com/gavv/httpexpect"
"github.com/kataras/iris" "github.com/kataras/iris"
"github.com/kataras/iris/httptest" "github.com/kataras/iris/httptest"
"github.com/op/go-logging"
"gopkg.in/DATA-DOG/go-sqlmock.v1" "gopkg.in/DATA-DOG/go-sqlmock.v1"
"testing" "testing"
) )
@ -27,7 +26,7 @@ func SetupIris(t *testing.T, debug bool, noauth bool) *httpexpect.Expect {
} }
DNSConf = dnscfg DNSConf = dnscfg
// In memory logger // In memory logger
logging.InitForTesting(logging.DEBUG) //logging.InitForTesting(logging.DEBUG)
err := DB.Init(DNSConf.Database.Engine, DNSConf.Database.Connection) err := DB.Init(DNSConf.Database.Engine, DNSConf.Database.Connection)
if err != nil { if err != nil {
panic(err) panic(err)

14
dns_test.go
View File

@ -5,13 +5,13 @@ import (
"flag" "flag"
"fmt" "fmt"
"github.com/miekg/dns" "github.com/miekg/dns"
"github.com/op/go-logging"
"os" "os"
"strings" "strings"
"testing" "testing"
) )
var testAddr = "0.0.0.0:15353" var testAddr1 = "0.0.0.0:15353"
var testAddr2 = "0.0.0.0:15354"
var records = []string{ var records = []string{
"auth.example.org. A 192.168.1.100", "auth.example.org. A 192.168.1.100",
@ -96,7 +96,6 @@ func startDNSServer(addr string) (*dns.Server, resolver) {
DNSConf = dnscfg DNSConf = dnscfg
logging.InitForTesting(logging.DEBUG)
// DNS server part // DNS server part
dns.HandleFunc(".", handleRequest) dns.HandleFunc(".", handleRequest)
server := &dns.Server{Addr: addr, Net: "udp"} server := &dns.Server{Addr: addr, Net: "udp"}
@ -111,9 +110,9 @@ func startDNSServer(addr string) (*dns.Server, resolver) {
} }
func TestResolveA(t *testing.T) { func TestResolveA(t *testing.T) {
server, resolver := startDNSServer(testAddr)
defer server.Shutdown()
RR.Parse(records) RR.Parse(records)
server, resolver := startDNSServer(testAddr1)
defer server.Shutdown()
answer, err := resolver.lookup("auth.example.org", dns.TypeA) answer, err := resolver.lookup("auth.example.org", dns.TypeA)
if err != nil { if err != nil {
t.Errorf("%v", err) t.Errorf("%v", err)
@ -128,6 +127,7 @@ func TestResolveA(t *testing.T) {
} else { } else {
t.Error("No answer for DNS query") t.Error("No answer for DNS query")
} }
server.Shutdown()
} }
func TestResolveTXT(t *testing.T) { func TestResolveTXT(t *testing.T) {
@ -145,9 +145,8 @@ func TestResolveTXT(t *testing.T) {
} }
defer DB.DB.Close() defer DB.DB.Close()
server, resolver := startDNSServer(testAddr) server, resolver := startDNSServer(testAddr2)
defer server.Shutdown() defer server.Shutdown()
RR.Parse(records)
validTXT := "______________valid_response_______________" validTXT := "______________valid_response_______________"
@ -204,4 +203,5 @@ func TestResolveTXT(t *testing.T) {
} }
} }
} }
server.Shutdown()
} }