ready_test.go: rm t.Fatalf in goroutine
@@ -4,7 +4,6 @@ import (
"context"
"fmt"
"net/http"
- "sync"
"testing"
"github.com/coredns/coredns/plugin/erratic"
@@ -21,22 +20,14 @@ func TestReady(t *testing.T) {
e := &erratic.Erratic{}
plugins.Append(e, "erratic")
- wg := sync.WaitGroup{}
- wg.Add(1)
- go func() {
if err := rd.onStartup(); err != nil {
t.Fatalf("Unable to startup the readiness server: %v", err)
}
- wg.Done()
- }()
- wg.Wait()
defer rd.onFinalShutdown()
address := fmt.Sprintf("http://%s/ready", rd.ln.Addr().String())
- wg.Add(1)
- go func() {
response, err := http.Get(address)
if err != nil {
t.Fatalf("Unable to query %s: %v", address, err)
@@ -45,9 +36,6 @@ func TestReady(t *testing.T) {
t.Errorf("Invalid status code: expecting %d, got %d", 503, response.StatusCode)
}
response.Body.Close()
- wg.Done()
- }()
- wg.Wait()
// make it ready by giving erratic 3 queries.
m := new(dns.Msg)
@@ -56,7 +44,7 @@ func TestReady(t *testing.T) {
e.ServeDNS(context.TODO(), &test.ResponseWriter{}, m)
e.ServeDNS(context.TODO(), &test.ResponseWriter{}, m)
- response, err := http.Get(address)
+ response, err = http.Get(address)
if err != nil {
t.Fatalf("Unable to query %s: %v", address, err)
}
