From b8cf13ea0636219f4e726ac8fc41d8ecbc4c948d Mon Sep 17 00:00:00 2001
From: mmukhi <mmukhi@google.com>
Date: Thu, 14 Dec 2017 13:23:05 -0800
Subject: [PATCH] Make sure all goroutines have ended before restoring global
 vars. (#1732)

---
 clientconn_test.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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