opensource/grpc-go
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make sure all goroutines have ended before restoring global vars. (#1732)

Browse Source
This commit is contained in:
mmukhi
2017-12-14 13:23:05 -08:00
committed by GitHub
parent 4742c425a7
commit b8cf13ea06
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
clientconn_test.go
View File

@ -169,11 +169,12 @@ func TestDialWaitsForServerSettings(t *testing.T) {
} }
func TestCloseConnectionWhenServerPrefaceNotReceived(t *testing.T) { func TestCloseConnectionWhenServerPrefaceNotReceived(t *testing.T) {
defer leakcheck.Check(t)
mctBkp := minConnectTimeout mctBkp := minConnectTimeout
// Call this only after transportMonitor goroutine has ended.
defer func() { defer func() {
minConnectTimeout = mctBkp minConnectTimeout = mctBkp
}() }()
defer leakcheck.Check(t)
minConnectTimeout = time.Millisecond * 500 minConnectTimeout = time.Millisecond * 500
server, err := net.Listen("tcp", "localhost:0") server, err := net.Listen("tcp", "localhost:0")
if err != nil { if err != nil {