From: Mikio Hara <mikioh.mikioh@gmail.com>
Date: Fri, 15 May 2015 03:10:10 +0000 (+0900)
Subject: net: don't show verbose information when -test.v=false
X-Git-Tag: go1.5beta1~483
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=cca39ff3b1a4da86e1115e0a1375f2f429d192c8;p=gostls13.git

net: don't show verbose information when -test.v=false

Updates #10845.

Change-Id: I4cec670c7db88c50a6e5619e611744e161d73b3c
Reviewed-on: https://go-review.googlesource.com/10131
Reviewed-by: Ian Lance Taylor <iant@golang.org>
---

diff --git a/src/net/main_test.go b/src/net/main_test.go
index ceec08911e..62b8997091 100644
--- a/src/net/main_test.go
+++ b/src/net/main_test.go
@@ -50,9 +50,9 @@ func TestMain(m *testing.M) {
 	st := m.Run()
 
 	testHookUninstaller.Do(uninstallTestHooks)
-	if !testing.Short() {
-		printLeakedGoroutines()
-		printLeakedSockets()
+	if testing.Verbose() {
+		printRunningGoroutines()
+		printInflightSockets()
 		printSocketStats()
 	}
 	forceCloseSockets()
@@ -98,8 +98,8 @@ func setupTestData() {
 	}
 }
 
-func printLeakedGoroutines() {
-	gss := leakedGoroutines()
+func printRunningGoroutines() {
+	gss := runningGoroutines()
 	if len(gss) == 0 {
 		return
 	}
@@ -110,9 +110,8 @@ func printLeakedGoroutines() {
 	fmt.Fprintf(os.Stderr, "\n")
 }
 
-// leakedGoroutines returns a list of remaining goroutines used in
-// test cases.
-func leakedGoroutines() []string {
+// runningGoroutines returns a list of remaining goroutines.
+func runningGoroutines() []string {
 	var gss []string
 	b := make([]byte, 2<<20)
 	b = b[:runtime.Stack(b, true)]
@@ -131,7 +130,7 @@ func leakedGoroutines() []string {
 	return gss
 }
 
-func printLeakedSockets() {
+func printInflightSockets() {
 	sos := sw.Sockets()
 	if len(sos) == 0 {
 		return