qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-23 11:20:05 -07:00
Code Releases Activity

syslog: fix data race on 'crashy' in test function

Browse Source 
Fixes #5894.

R=golang-dev, iant
CC=golang-dev
https://golang.org/cl/13303051
This commit is contained in:
Russ Cox 2013-09-09 16:17:59 -04:00
parent 87a6d75012
commit 1b651556c3
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/pkg/log/syslog/syslog_test.go
View File

@ -122,7 +122,9 @@ func TestWithSimulated(t *testing.T) {
for _, tr := range transport {
done := make(chan string)
addr, _, _ := startServer(tr, "", done)
addr, sock, srvWG := startServer(tr, "", done)
defer srvWG.Wait()
defer sock.Close()
if tr == "unix" || tr == "unixgram" {
defer os.Remove(addr)
}
@ -142,7 +144,8 @@ func TestWithSimulated(t *testing.T) {
func TestFlap(t *testing.T) {
net := "unix"
done := make(chan string)
addr, sock, _ := startServer(net, "", done)
addr, sock, srvWG := startServer(net, "", done)
defer srvWG.Wait()
defer os.Remove(addr)
defer sock.Close()
@ -158,7 +161,8 @@ func TestFlap(t *testing.T) {
check(t, msg, <-done)
// restart the server
_, sock2, _ := startServer(net, addr, done)
_, sock2, srvWG2 := startServer(net, addr, done)
defer srvWG2.Wait()
defer sock2.Close()
// and try retransmitting
@ -249,7 +253,8 @@ func TestWrite(t *testing.T) {
} else {
for _, test := range tests {
done := make(chan string)
addr, sock, _ := startServer("udp", "", done)
addr, sock, srvWG := startServer("udp", "", done)
defer srvWG.Wait()
defer sock.Close()
l, err := Dial("udp", addr, test.pri, test.pre)
if err != nil {
@ -272,7 +277,8 @@ func TestWrite(t *testing.T) {
}
func TestConcurrentWrite(t *testing.T) {
addr, sock, _ := startServer("udp", "", make(chan string))
addr, sock, srvWG := startServer("udp", "", make(chan string, 1))
defer srvWG.Wait()
defer sock.Close()
w, err := Dial("udp", addr, LOG_USER|LOG_ERR, "how's it going?")
if err != nil {