From 11ac72a1161921f61a8e36ed50474c1789b7ca1c Mon Sep 17 00:00:00 2001 From: Mikio Hara Date: Tue, 22 Dec 2015 09:35:27 +0900 Subject: [PATCH] net: fix race in TestTCPStress Fixes #13704. Change-Id: I7afef5058fa88b0de41213cf46219b684369f47f Reviewed-on: https://go-review.googlesource.com/18111 Reviewed-by: Ian Lance Taylor --- src/net/tcp_test.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/net/tcp_test.go b/src/net/tcp_test.go index 2191c91fa3..30c5762592 100644 --- a/src/net/tcp_test.go +++ b/src/net/tcp_test.go @@ -539,9 +539,12 @@ func TestTCPStress(t *testing.T) { if err != nil { t.Fatal(err) } - defer ln.Close() + done := make(chan bool) // Acceptor. go func() { + defer func() { + done <- true + }() for { c, err := ln.Accept() if err != nil { @@ -559,7 +562,6 @@ func TestTCPStress(t *testing.T) { }(c) } }() - done := make(chan bool) for i := 0; i < conns; i++ { // Client connection. go func() { @@ -583,4 +585,6 @@ func TestTCPStress(t *testing.T) { for i := 0; i < conns; i++ { <-done } + ln.Close() + <-done } -- 2.50.0