clones/go
1
0
Fork 0
mirror of https://github.com/golang/go.git synced 2024-09-30 06:47:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

net: fix leak in test

Browse Source 
Also change the Listner variable name from l to ln.

R=golang-dev, rsc, dave
CC=golang-dev
https://golang.org/cl/5918046
This commit is contained in:
Mikio Hara 2012-05-19 10:42:54 +09:00
parent 9cfb845af6
commit ba57c88003
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/pkg/net/net_test.go
View File

@ -16,15 +16,15 @@ func TestShutdown(t *testing.T) {
t.Logf("skipping test on %q", runtime.GOOS) t.Logf("skipping test on %q", runtime.GOOS)
return return
} }
l, err := Listen("tcp", "127.0.0.1:0") ln, err := Listen("tcp", "127.0.0.1:0")
if err != nil { if err != nil {
if l, err = Listen("tcp6", "[::1]:0"); err != nil { if ln, err = Listen("tcp6", "[::1]:0"); err != nil {
t.Fatalf("ListenTCP on :0: %v", err) t.Fatalf("ListenTCP on :0: %v", err)
} }
} }
go func() { go func() {
c, err := l.Accept() c, err := ln.Accept()
if err != nil { if err != nil {
t.Fatalf("Accept: %v", err) t.Fatalf("Accept: %v", err)
} }
@ -37,7 +37,7 @@ func TestShutdown(t *testing.T) {
c.Close() c.Close()
}() }()
c, err := Dial("tcp", l.Addr().String()) c, err := Dial("tcp", ln.Addr().String())
if err != nil { if err != nil {
t.Fatalf("Dial: %v", err) t.Fatalf("Dial: %v", err)
} }
@ -59,7 +59,7 @@ func TestShutdown(t *testing.T) {
} }
func TestTCPListenClose(t *testing.T) { func TestTCPListenClose(t *testing.T) {
l, err := Listen("tcp", "127.0.0.1:0") ln, err := Listen("tcp", "127.0.0.1:0")
if err != nil { if err != nil {
t.Fatalf("Listen failed: %v", err) t.Fatalf("Listen failed: %v", err)
} }
@ -67,11 +67,12 @@ func TestTCPListenClose(t *testing.T) {
done := make(chan bool, 1) done := make(chan bool, 1)
go func() { go func() {
time.Sleep(100 * time.Millisecond) time.Sleep(100 * time.Millisecond)
l.Close() ln.Close()
}() }()
go func() { go func() {
_, err = l.Accept() c, err := ln.Accept()
if err == nil { if err == nil {
c.Close()
t.Error("Accept succeeded") t.Error("Accept succeeded")
} else { } else {
t.Logf("Accept timeout error: %s (any error is fine)", err) t.Logf("Accept timeout error: %s (any error is fine)", err)
@ -86,7 +87,7 @@ func TestTCPListenClose(t *testing.T) {
} }
func TestUDPListenClose(t *testing.T) { func TestUDPListenClose(t *testing.T) {
l, err := ListenPacket("udp", "127.0.0.1:0") ln, err := ListenPacket("udp", "127.0.0.1:0")
if err != nil { if err != nil {
t.Fatalf("Listen failed: %v", err) t.Fatalf("Listen failed: %v", err)
} }
@ -95,10 +96,10 @@ func TestUDPListenClose(t *testing.T) {
done := make(chan bool, 1) done := make(chan bool, 1)
go func() { go func() {
time.Sleep(100 * time.Millisecond) time.Sleep(100 * time.Millisecond)
l.Close() ln.Close()
}() }()
go func() { go func() {
_, _, err = l.ReadFrom(buf) _, _, err = ln.ReadFrom(buf)
if err == nil { if err == nil {
t.Error("ReadFrom succeeded") t.Error("ReadFrom succeeded")
} else { } else {