From: Mikio Hara <mikioh.mikioh@gmail.com>
Date: Sat, 25 Apr 2015 22:52:28 +0000 (+0900)
Subject: net: don't miss testing server teardowns when test fails early
X-Git-Tag: go1.5beta1~879
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=9bef5cfb9b6f8db3465f1b7e799db66599915096;p=gostls13.git

net: don't miss testing server teardowns when test fails early

Change-Id: I9fa678e43b4ae3970323cac474b5f86d4d933997
Reviewed-on: https://go-review.googlesource.com/9382
Reviewed-by: Ian Lance Taylor <iant@golang.org>
---

diff --git a/src/net/server_test.go b/src/net/server_test.go
index d433ecfa4b..140716598d 100644
--- a/src/net/server_test.go
+++ b/src/net/server_test.go
@@ -69,6 +69,11 @@ func TestTCPServer(t *testing.T) {
 
 		var lss []*localServer
 		var tpchs []chan error
+		defer func() {
+			for _, ls := range lss {
+				ls.teardown()
+			}
+		}()
 		for i := 0; i < N; i++ {
 			ls, err := (&streamListener{Listener: ln}).newLocalServer()
 			if err != nil {
@@ -77,11 +82,6 @@ func TestTCPServer(t *testing.T) {
 			lss = append(lss, ls)
 			tpchs = append(tpchs, make(chan error, 1))
 		}
-		defer func() {
-			for _, ls := range lss {
-				ls.teardown()
-			}
-		}()
 		for i := 0; i < N; i++ {
 			ch := tpchs[i]
 			handler := func(ls *localServer, ln Listener) { transponder(ln, ch) }
@@ -153,6 +153,11 @@ func TestUnixAndUnixpacketServer(t *testing.T) {
 
 		var lss []*localServer
 		var tpchs []chan error
+		defer func() {
+			for _, ls := range lss {
+				ls.teardown()
+			}
+		}()
 		for i := 0; i < N; i++ {
 			ls, err := (&streamListener{Listener: ln}).newLocalServer()
 			if err != nil {
@@ -161,11 +166,6 @@ func TestUnixAndUnixpacketServer(t *testing.T) {
 			lss = append(lss, ls)
 			tpchs = append(tpchs, make(chan error, 1))
 		}
-		defer func() {
-			for _, ls := range lss {
-				ls.teardown()
-			}
-		}()
 		for i := 0; i < N; i++ {
 			ch := tpchs[i]
 			handler := func(ls *localServer, ln Listener) { transponder(ln, ch) }