community
/
dns
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tests: wait for the server to be started before proceeding

This commit is contained in:
Filippo Valsorda 2014-12-06 02:33:35 +00:00
parent 0afbf1143c
commit ddb0b0f565
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
server_test.go
View File

@ -6,6 +6,7 @@ import (
"runtime"
"sync"
"testing"
"time"
)
func HelloServer(w ResponseWriter, req *Msg) {
@ -36,6 +37,9 @@ func RunLocalUDPServer(laddr string) (*Server, string, error) {
server.ActivateAndServe()
pc.Close()
}()
time.Sleep(50 * time.Millisecond)
return server, pc.LocalAddr().String(), nil
}
@ -49,6 +53,19 @@ func RunLocalTCPServer(laddr string) (*Server, string, error) {
server.ActivateAndServe()
l.Close()
}()
for i := 0; ; i++ {
conn, err := net.Dial("tcp", l.Addr().String())
if err == nil {
conn.Close()
break
}
time.Sleep(50 * time.Millisecond)
if i > 50 {
return nil, "", fmt.Errorf("failed to start server: ", err)
}
}
return server, l.Addr().String(), nil
}
@ -342,9 +359,6 @@ func TestShutdownTCP(t *testing.T) {
if err != nil {
t.Fatalf("Unable to run test server: %s", err)
}
// it normally is too early to shutting down because server
// activates in goroutine.
runtime.Gosched()
err = s.Shutdown()
if err != nil {
t.Errorf("Could not shutdown test TCP server, %s", err)
@ -356,9 +370,6 @@ func TestShutdownUDP(t *testing.T) {
if err != nil {
t.Fatalf("Unable to run test server: %s", err)
}
// it normally is too early to shutting down because server
// activates in goroutine.
runtime.Gosched()
err = s.Shutdown()
if err != nil {
t.Errorf("Could not shutdown test UDP server, %s", err)