Make sure all goroutines have ended before restoring global vars. (gr…

…pc#1732)
ZedYu · Dec 14, 2017 · b8cf13e · b8cf13e
1 parent 4742c42
commit b8cf13e
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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 {