net: fix tester goroutine leakage in tests
This change tries to stop various tester goroutines at the end of each
scope for avoiding interference between test cases including benchmarks.
Not yet finished completely but enough to land upcoming changes to Dial
functions. The rest will be fixed later.
Change-Id: Ic38b8681a3a2ddbcd69ba3696f24a61d418a0346
Reviewed-on: https://go-review.googlesource.com/8398
Reviewed-by: Ian Lance Taylor <iant@golang.org>
diff --git a/src/net/unix_test.go b/src/net/unix_test.go
index 85d1ff4..ca7872e 100644
--- a/src/net/unix_test.go
+++ b/src/net/unix_test.go
@@ -235,6 +235,7 @@
t.Skip("unix test")
}
+ handler := func(ls *localServer, ln Listener) {}
for _, laddr := range []string{"", testUnixAddr()} {
laddr := laddr
taddr := testUnixAddr()
@@ -246,13 +247,14 @@
if err != nil {
t.Fatalf("ListenUnix failed: %v", err)
}
- defer func() {
- ln.Close()
- os.Remove(taddr)
- }()
-
- done := make(chan int)
- go transponder(t, ln, done)
+ ls, err := (&streamListener{Listener: ln}).newLocalServer()
+ if err != nil {
+ t.Fatal(err)
+ }
+ defer ls.teardown()
+ if err := ls.buildup(handler); err != nil {
+ t.Fatal(err)
+ }
la, err := ResolveUnixAddr("unix", laddr)
if err != nil {
@@ -288,8 +290,6 @@
t.Fatalf("got %#v, expected %#v", ca.got, ca.want)
}
}
-
- <-done
}
}
