From: Ian Lance Taylor <iant@golang.org>
Date: Wed, 27 Sep 2017 00:47:51 +0000 (-0700)
Subject: net: use newLocalListener in TestClosingListener.
X-Git-Tag: go1.10beta1~947
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=d0006e78681351aae94f9d757232203f43d8b7ee;p=gostls13.git

net: use newLocalListener in TestClosingListener.

Updates #21856

Change-Id: I9baa51fe23e6dd2fcf9dd14f7acfaf7457571e1d
Reviewed-on: https://go-review.googlesource.com/66334
Run-TryBot: Ian Lance Taylor <iant@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: David Crawshaw <crawshaw@golang.org>
Reviewed-by: Mikio Hara <mikioh.mikioh@gmail.com>
---

diff --git a/src/net/listen_test.go b/src/net/listen_test.go
index 63fb144fdc..c15b6bdc8f 100644
--- a/src/net/listen_test.go
+++ b/src/net/listen_test.go
@@ -700,15 +700,15 @@ func multicastRIBContains(ip IP) (bool, error) {
 
 // Issue 21856.
 func TestClosingListener(t *testing.T) {
-	listener, err := Listen("tcp", ":0")
+	ln, err := newLocalListener("tcp")
 	if err != nil {
 		t.Fatal(err)
 	}
-	addr := listener.Addr()
+	addr := ln.Addr()
 
 	go func() {
 		for {
-			c, err := listener.Accept()
+			c, err := ln.Accept()
 			if err != nil {
 				return
 			}
@@ -721,10 +721,11 @@ func TestClosingListener(t *testing.T) {
 	// testing anything, which is OK.
 	time.Sleep(time.Millisecond)
 
-	listener.Close()
+	ln.Close()
 
-	_, err = Listen("tcp", addr.String())
+	ln, err = Listen("tcp", addr.String())
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
+	ln.Close()
 }