From d0006e78681351aae94f9d757232203f43d8b7ee Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Tue, 26 Sep 2017 17:47:51 -0700 Subject: [PATCH] net: use newLocalListener in TestClosingListener. Updates #21856 Change-Id: I9baa51fe23e6dd2fcf9dd14f7acfaf7457571e1d Reviewed-on: https://go-review.googlesource.com/66334 Run-TryBot: Ian Lance Taylor TryBot-Result: Gobot Gobot Reviewed-by: David Crawshaw Reviewed-by: Mikio Hara --- src/net/listen_test.go | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) 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() } -- 2.50.0