Mirrors/coredns
1
0
Fork 0
mirror of https://github.com/coredns/coredns.git synced 2025-10-28 08:44:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

ready_test.go: rm t.Fatalf in goroutine (#3284)

Browse Source 
Signed-off-by: Guangming Wang <guangming.wang@daocloud.io>
This commit is contained in:
Guangming Wang
2019-09-19 14:04:19 +08:00
committed by Miek Gieben
parent 77e8b38877
commit 2324439adf
1 changed files with 12 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
plugin/ready/ready_test.go
View File

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